From: Maxious <maxious@lambdacomplex.org>
Date: Sun, 04 Dec 2011 05:32:32 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=f8d2cd23bc0abe9dc821c752a502e94ec4d88044
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard

Conflicts:
admin/updateUNSPSC.php
---


--- 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/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 ) || \'0000000\'::text) as "cat1",  
+ (substr( "categoryUNSPSC"::text, 0, 3 ) || \'000000\'::text) as "cat2",
+ (substr( "categoryUNSPSC"::text, 0, 4 ) || \'00000\'::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));
     }