From: Alexander Sadleir <maxious@lambdacomplex.org>
Date: Fri, 02 Dec 2011 10:15:26 +0000
Subject: More unspsc
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=ad85afdffdb26d9845d1107c7155df2add4da610
---
More unspsc
---


--- a/admin/fixoldamend.php
+++ b/admin/fixoldamend.php
@@ -20,7 +20,7 @@
     echo "$oldCN => $newCN (from parent CN $parentCN) <br>\n";
     }
     else {
-        echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']} <br>\n";
+//        echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']} <br>\n";
     }
 }
 

--- a/admin/updateUNSPSC.php
+++ b/admin/updateUNSPSC.php
@@ -19,20 +19,29 @@
     $unspsc[$armor] = $row['UNSPSC'];
     $erre = str_replace("er", "re", $row['Title']);
     $unspsc[$erre] = $row['UNSPSC'];
+    $center = str_replace("center", "centre", $row['Title']);
+    $unspsc[$center] = $row['UNSPSC'];
+      $accessory = str_replace("accesor", "accessor", $row['Title']);
+    $unspsc[$accessory] = $row['UNSPSC'];
+    $lyslyz = str_replace("lyz", "lys", $row['Title']);
+    $unspsc[$lyslyz] = $row['UNSPSC'];
         $tire = str_replace("ire", "yre", $row['Title']);
     $unspsc[$tire] = $row['UNSPSC'];
-       $aeroplane = str_replace("airplane","aeroplane", $row['Title']);
-    $unspsc[$aeroplane] = $row['UNSPSC'];
-    $lyslyz = str_replace("lyz", "lys", $row['Title']);
-    $unspsc[$lyslyz] = $row['UNSPSC'];
+    
+        $pe = str_replace("pe", "pae", $row['Title']);
+    $unspsc[$pe] = $row['UNSPSC'];
+            $ane = str_replace("ane", "anae", $row['Title']);
+    $unspsc[$ane] = $row['UNSPSC'];
+        $airo = str_replace("airplane", "aeroplane", $row['Title']);
+    $unspsc[$airo] = $row['UNSPSC'];
     // some divergence from standard
+      $forensicit = str_replace("Information technology consultation services", "Forensic IT Services", $row['Title']);
+        $unspsc[$forensicit] = $row['UNSPSC'];
+        $powercable = str_replace( "Power cable", "Power cable installation and supply", $row['Title']);
+    $unspsc[$powercable] = $row['UNSPSC'];
     $tobacco = str_replace("Food Beverage and Tobacco Products", "Food and Beverage Products", $row['Title']);
     $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']);

--- a/exportData.csv.php
+++ b/exportData.csv.php
@@ -3,33 +3,17 @@
 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",
-(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",
+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", 
  "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] != "") {
@@ -37,8 +21,8 @@
 }
 
 $num_fields = $query->columnCount();
-$headers = Array();
-for ($i = 0; $i < $num_fields; $i++) { // for each column in query, make a CSV header
+$headers = array();
+for ($i = 0; $i < $num_fields; $i++) {
     $meta = $query->getColumnMeta($i);
     $headers[] = $meta['name'];
 }
@@ -57,10 +41,6 @@
                     || $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));
     }