robots.txt added
--- a/admin/linkAmendments.php
+++ b/admin/linkAmendments.php
@@ -2,7 +2,7 @@
include_once ("../lib/common.inc.php");
$query = 'SELECT c."CNID",c."parentCN",p."childCN" FROM contractnotice as c LEFT OUTER JOIN contractnotice as p on c."parentCN" = p."CNID"
WHERE
-c."parentCN" > 0 AND p."childCN" IS NULL ';
+c."parentCN" IS NOT NULL AND p."childCN" IS NULL ';
$query = $conn->prepare($query);
$query->execute();
databaseError($conn->errorInfo());
@@ -28,9 +28,9 @@
FROM contractnotice
GROUP BY "parentCN"
HAVING COUNT(*) > 1
- AND "parentCN" != 0
+ AND "parentCN" IS NOT NULL
)
-AND "childCN" = 0
+AND "childCN" IS NULL
GROUP BY "parentCN" having count(*) > 1';
$query = $conn->prepare($query);
$query->execute();
--- a/admin/updateUNSPSC.php
+++ b/admin/updateUNSPSC.php
@@ -43,6 +43,10 @@
$unspsc[$tobacco] = $row['UNSPSC'];
$architect = str_replace("Building and Construction and Maintenance Services", "Architectural services", $row['Title']);
$unspsc[$architect] = $row['UNSPSC'];
+ $powercable = str_replace("Power cable", "Power cable installation and supply", $row['Title']);
+ $unspsc[$powercable] = $row['UNSPSC'];
+ $forensicIT = str_replace("Building and Construction and Maintenance Services", "Architectural services", $row['Title']);
+ $unspsc[$architect] = $row['UNSPSC'];
// some just plain wrong
$noOilRigs = str_replace("Building and Construction and Maintenance Services", "Management and provision of all facilities engineering modification and maintenance services for a site or platform", $row['Title']);
$unspsc[$noOilRigs] = $row['UNSPSC'];
--- a/displayBubbletree.php
+++ b/displayBubbletree.php
@@ -32,48 +32,48 @@
}
$total = 0;
-$catsresult = $conn->prepare('SELECT distinct substr( "categoryUNSPSC"::text, 0, 2 ) as cat
+$catsresult = $conn->prepare('SELECT distinct substr( "categoryUNSPSC"::text, 0, 3 ) as cat
FROM contractnotice WHERE "categoryUNSPSC" IS NOT NULL group by "categoryUNSPSC";;');
$catsresult->execute();
foreach ($catsresult->fetchAll() as $row) {
$cats[] = $row['cat'];
}
-$cattwosresult = $conn->prepare('SELECT distinct substr( "categoryUNSPSC"::text, 0, 3 ) as cat
+$cattwosresult = $conn->prepare('SELECT distinct substr( "categoryUNSPSC"::text, 0, 5 ) as cat
FROM contractnotice
WHERE "categoryUNSPSC" IS NOT NULL
GROUP BY "categoryUNSPSC" order by cat ;');
$cattwosresult->execute();
foreach ($cattwosresult->fetchAll() as $tworow) {
- $cattwos[substr($tworow['cat'],0,1)][] = $tworow['cat'];
+ $cattwos[substr($tworow['cat'],0,2)][] = $tworow['cat'];
}
-$catthreesresult = $conn->prepare('SELECT substr( "categoryUNSPSC"::text, 0, 4 ) as cat , SUM( "value" ) as value
+$catthreesresult = $conn->prepare('SELECT substr( "categoryUNSPSC"::text, 0, 7 ) as cat , SUM( "value" ) as value
FROM contractnotice
WHERE "childCN" is null and "categoryUNSPSC" IS NOT NULL
GROUP BY cat order by cat ;');
$catthreesresult->execute();
foreach ($catthreesresult->fetchAll() as $threerow) {
- $catthrees[substr($threerow['cat'],0,2)][] = $threerow;
+ $catthrees[substr($threerow['cat'],0,4)][] = $threerow;
}
$nodes = Array();
foreach ($cats as $catNum) {
$catColor = $color->hsv2hex(Array($catNum/10, .7, abs(($catNum*(1/10))-.5) + .5));
- $catName = $unspsc[$catNum . "0000000"] . $catNum;
+ $catName = substr($unspsc[$catNum . "000000"],0,18) . $catNum;
$subnodes = Array();
$catValue = 0;
foreach ($cattwos[$catNum] as $twoCatNum) {
- $subcatName = $unspsc[$twoCatNum. "000000"] .$twoCatNum;
+ $subcatName = $unspsc[$twoCatNum. "0000"] .$twoCatNum;
$subsubnodes = Array();
- $subCatValue = 0;
+ $subCatValue = 1;
$subCatColor = $color->hsv2hex(Array($catNum/10, rand(1,10)/10, abs(($catNum*(1/10))-.5) + .5));
foreach ($catthrees[$twoCatNum] as $threerow) {
- $subsubcatName = $unspsc[$threerow['cat'] . "00000"] . $threerow['cat'];
+ $subsubcatName = $unspsc[$threerow['cat'] . "00"] . $threerow['cat'];
$subsubnodes[] = Array(
"label" => $subsubcatName,
"amount" => $threerow['value'],
- //"color" => "#".$subCatColor
+ "color" => "#".$subCatColor
);
$subCatValue += $threerow['value'];
}
--- a/exportData.csv.php
+++ b/exportData.csv.php
@@ -3,17 +3,33 @@
include_once("./lib/common.inc.php");
setlocale(LC_CTYPE, 'C');
// source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
+
+$unspsc = Array();
+$unspscresult = $conn->prepare('select * from "UNSPSCcategories" where "UNSPSC"::text like \'%00000\';');
+$unspscresult->execute();
+foreach ($unspscresult->fetchAll() as $row) {
+ $unspsc[$row['UNSPSC']] = $row['Title'];
+}
+
$query = $conn->prepare('
-SELECT "CNID",contractnotice."agencyName",agency.abn as "agencyABN",EXTRACT(EPOCH FROM "publishDate") as "publishDate",EXTRACT(EPOCH FROM "contractStart") as "contractStart",EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",value,description,"procurementMethod",category,"categoryUNSPSC",
+SELECT "CNID",contractnotice."agencyName",agency.abn as "agencyABN",
+EXTRACT(EPOCH FROM "publishDate") as "publishDate",
+EXTRACT(EPOCH FROM "contractStart") as "contractStart",
+EXTRACT(EPOCH FROM "contractEnd") as "contractEnd",
+value,description,"procurementMethod",category,"categoryUNSPSC",
+(substr( "categoryUNSPSC"::text, 0, 2 ) || \'000000\'::text) as "cat1",
+ (substr( "categoryUNSPSC"::text, 0, 4 ) || \'0000\'::text) as "cat2",
+ (substr( "categoryUNSPSC"::text, 0, 6 ) || \'00\'::text) as "cat3",
"supplierABN","supplierName",
(
case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
(\'https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN\'::text || "CNID"::text) as sourceURL
-FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName" where "childCN" is null'
+FROM contractnotice join agency on contractnotice."agencyName"=agency."agencyName"
+where "childCN" is null'
, array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
// "supplierCity","supplierPostcode","supplierCountry","contactPostcode",
-// (substr( "categoryUNSPSC"::text, 0, 2 ) || \'0000000\'::text) as "categoryUNSPSClv1", "categoryUNSPSC", (substr( "categoryUNSPSC"::text, 0, 3 ) || \'000000\'::text) as "categoryUNSPSClv2" "categoryUNSPSC", (substr( "categoryUNSPSC"::text, 0, 4 ) || \'00000\'::text as "categoryUNSPSClv3")
+//
$query->execute();
$errors = $conn->errorInfo();
if ($errors[2] != "") {
@@ -21,8 +37,8 @@
}
$num_fields = $query->columnCount();
-$headers = array();
-for ($i = 0; $i < $num_fields; $i++) {
+$headers = Array();
+for ($i = 0; $i < $num_fields; $i++) { // for each column in query, make a CSV header
$meta = $query->getColumnMeta($i);
$headers[] = $meta['name'];
}
@@ -41,6 +57,10 @@
|| $headers[$key] == "contractEnd") {
$colvalue = date("Y-m-d", $colvalue);
}
+ if ($headers[$key] == "cat1" || $headers[$key] == "cat2"
+ || $headers[$key] == "cat3") {
+ $colvalue = $unspsc[$colvalue];
+ }
}
fputcsv($fp, array_values($row));
}
--- /dev/null
+++ b/robots.txt
@@ -1,1 +1,3 @@
+User-agent: *
+Disallow: /admin