Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard

file:b/.gitmodules (new)
  [submodule "lib/bubbletree"]
  path = lib/bubbletree
  url = https://github.com/okfn/bubbletree.git
 
file:a/about.php -> file:b/about.php
<?php <?php
include('./lib/common.inc.php'); include('./lib/common.inc.php');
include_header("Map"); include_header("Map");
?> ?>
<div class="msg_list"> <div class="msg_list">
<p class="msg_head">Header-1 </p> <p class="msg_head">Header-1 </p>
<div class="msg_body"> <div class="msg_body">
orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
</div> </div>
<p class="msg_head">Header-2</p> <p class="msg_head">Header-2</p>
<div class="msg_body"> <div class="msg_body">
orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
</div> </div>
<p class="msg_head">Header-3</p> <p class="msg_head">Header-3</p>
<div class="msg_body"> <div class="msg_body">
orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
</div> </div>
</div> </div>
  <?php CNDistributionGraph(); ?>
  sourced from austender
sourced from austender  
Government Agency Information (2009-07-10): National Archives of Australia, http://www.naa.gov.au under Creative Commons - Attribution 2.5 Australia (CC-BY) Government Agency Information (2009-07-10): National Archives of Australia, http://www.naa.gov.au under Creative Commons - Attribution 2.5 Australia (CC-BY)
jpgraph for php  
ABR ABR
Redhat Liberation fonts  
   
<?php <?php
include_once("./lib/common.inc.php"); include_once("./lib/common.inc.php");
$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end $query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM `contractnotice` WHERE childCN = 0 AND parentCN = 0 AND DATE(importDate) in (select * from (SELECT DATE(importDate) FROM contractnotice WHERE "childCN" = 0 AND "parentCN" = 0 AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)"; FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$result = mysql_query($query); $query = $conn->prepare($query);
  $query->execute();
  if (!$query) {
  databaseError($conn->errorInfo());
  }
echo "<div>"; echo "<div>";
$stats = mysql_fetch_array($result, MYSQL_BOTH); $stats = $query->fetch(PDO::FETCH_ASSOC);
echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>"; echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end $query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM `contractnotice` WHERE (childCN != 0 OR parentCN != 0) AND DATE(importDate) in (select * from (SELECT DATE(importDate) FROM contractnotice WHERE ("childCN" != 0 OR "parentCN" != 0) AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)"; FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$result = mysql_query($query); $query = $conn->prepare($query);
  $query->execute();
  if (!$query) {
  databaseError($conn->errorInfo());
  }
echo "<div>"; echo "<div>";
$stats = mysql_fetch_array($result, MYSQL_BOTH); $stats = $query->fetch(PDO::FETCH_ASSOC);
echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>"; echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
echo "Last updated: ". $stats["importday"]."<br>"; echo "Last updated: ". $stats["importday"]."<br>";
/* Check for null Procurement method and 0 ABN when not ABN exempt */ /* Check for null Procurement method and 0 ABN when not ABN exempt */
include_footer(); include_footer();
?> ?>
  "Cp1252",,,
  "Domain","UniqueName","Name",
  "unspsc","All","All commodities",
  "unspsc",10000000,"Live Plant and Animal Material and Accessories and Supplies",
  "unspsc",10100000,"Live animals",
  "unspsc",10101500,"Livestock",
  "unspsc",10101501,"Cats",
  "unspsc",10101502,"Dogs",
  "unspsc",10101504,"Mink",
  "unspsc",10101505,"Rats",
  "unspsc",10101506,"Horses",
  "unspsc",10101507,"Sheep",
  "unspsc",10101508,"Goats",
  "unspsc",10101509,"Asses",
  "unspsc",10101510,"Mice",
  "unspsc",10101511,"Swine",
  "unspsc",10101512,"Rabbits",
  "unspsc",10101513,"Guinea pigs",
  "unspsc",10101514,"Primates",
  "unspsc",10101515,"Armadillos",
  "unspsc",10101516,"Cattle",
  "unspsc",10101517,"Camels",
  "unspsc",10101600,"Birds and fowl",
  "unspsc",10101601,"Live chickens",
  "unspsc",10101602,"Live ducks",
  "unspsc",10101603,"Live turkeys",
  "unspsc",10101604,"Live geese",
  "unspsc",10101605,"Live pheasants",
  "unspsc",10101700,"Live fish",
  "unspsc",10101701,"Live salmon",
  "unspsc",10101702,"Live trout",
  "unspsc",10101703,"Live talapia",
  "unspsc",10101704,"Live carp",
  "unspsc",10101705,"Live eels",
  "unspsc",10101800,"Shellfish and aquatic invertebrates",
  "unspsc",10101801,"Live shrimp",
  "unspsc",10101802,"Live clams",
  "unspsc",10101803,"Live mussels",
  "unspsc",10101804,"Live oysters",
  "unspsc",10101805,"Live crabs",
  "unspsc",10101806,"Live abalone",
  "unspsc",10101807,"Live octopi",
  "unspsc",10101808,"Live squid",
  "unspsc",10101900,"Insects",
  "unspsc",10101901,"Butterflies",
  "unspsc",10101902,"Beetles",
  "unspsc",10101903,"Bees",
  "unspsc",10101904,"Silkworms",
  "unspsc",10102000,"Wild animals",
  "unspsc",10102001,"Elephants",
  "unspsc",10102002,"Live foxes",
  "unspsc",10110000,"Domestic pet products",
  "unspsc",10111300,"Domestic pet treatments and accessories and equipment",
  "unspsc",10111301,"Pet toys",
  "unspsc",10111302,"Pet grooming products",
  "unspsc",10111303,"Pet litter or equipment for pet waste management",
  "unspsc",10111304,"Pet food bowls or equipment",
  "unspsc",10111305,"Medicated pet treatments",
  "unspsc",10111306,"Domestic pet training kits",
  "unspsc",10111307,"Pet blankets",
  "unspsc",10120000,"Animal feed",
  "unspsc",10121500,"Livestock feed",
  "unspsc",10121501,"Pure wheat bran",
  "unspsc",10121502,"Feed oats",
  "unspsc",10121503,"Feed corn",
  "unspsc",10121504,"Feed sorghum",
  "unspsc",10121505,"Hay",
  "unspsc",10121506,"Oil cake",
  "unspsc",10121600,"Bird and fowl food",
  "unspsc",10121601,"Live food for birds",
  "unspsc",10121602,"Bird seed",
  "unspsc",10121603,"Bird treats or snacks",
  "unspsc",10121604,"Poultry food",
  "unspsc",10121700,"Fish food",
  "unspsc",10121701,"Fresh or frozen brine",
  "unspsc",10121702,"Fish food pellets",
  "unspsc",10121703,"Fish food flakes",
  "unspsc",10121800,"Dog and cat food",
  "unspsc",10121801,"Dry food for dogs",
  "unspsc",10121802,"Moist food for dogs",
  "unspsc",10121803,"Milk for dogs or cats",
  "unspsc",10121804,"Dry food for cats",
  "unspsc",10121805,"Moist food for cats",
  "unspsc",10121806,"Treats or snacks for cats or dogs",
  "unspsc",10121900,"Rodent food",
  "unspsc",10121901,"Pelletized food for rodents",
  "unspsc",10122000,"Reptile food",
  "unspsc",10122001,"Pelletized food for reptiles",
  "unspsc",10122002,"Moist food for reptiles",
  "unspsc",10122003,"Live food for reptiles",
  "unspsc",10122100,"Miscellaneous animal food",
  "unspsc",10122101,"Pig food",
  "unspsc",10122102,"Mink food",
  "unspsc",10122103,"Monkey food",
  "unspsc",10130000,"Animal containment and habitats",
  "unspsc",10131500,"Animal shelters",
  "unspsc",10131506,"Livestock stables",
  "unspsc",10131507,"Domesticized pet houses",
  "unspsc&quo