From: Alexander Sadleir <maxious@lambdacomplex.org>
Date: Sat, 10 Dec 2011 05:50:36 +0000
Subject: Improve OS validation
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=5615c5e14c2aeb1bcdeb4553fe5438d023858157
---
Improve OS validation
---


--- 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
@@ -16,10 +16,9 @@
 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",
+value,description,"procurementMethod",category as cat3,
+(substr( "categoryUNSPSC"::text, 0, 3 ) || \'000000\'::text) as "cat1",  
+(substr( "categoryUNSPSC"::text, 0, 5 ) || \'0000\'::text) as "cat2",
  "supplierABN","supplierName",
 (
  case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID,
@@ -29,7 +28,6 @@
 where "childCN" is null'
         , array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
 // "supplierCity","supplierPostcode","supplierCountry","contactPostcode",
-// 
 $query->execute();
 $errors = $conn->errorInfo();
 if ($errors[2] != "") {
@@ -57,6 +55,9 @@
                     || $headers[$key] == "contractEnd") {
                 $colvalue = date("Y-m-d", $colvalue);
             }
+            if ($headers[$key] == "CNID") {
+                $colvalue = str_replace("A","", $colvalue);
+}
             if ($headers[$key] == "cat1" || $headers[$key] == "cat2"
                     || $headers[$key] == "cat3") {
                 $colvalue = $unspsc[$colvalue];

--- /dev/null
+++ b/robots.txt
@@ -1,1 +1,3 @@
+User-agent: *
+Disallow: /admin