From: maxious <maxious@taiga.(none)>
Date: Thu, 10 Dec 2009 21:10:05 +0000
Subject: updated update script and merged lobbylens admin scripts
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=a27dce471b22984d81be734578f1cc87335e31dd
---
updated update script and merged lobbylens admin scripts
---


--- a/admin/abr-example.php
+++ b/admin/abr-example.php

--- /dev/null
+++ b/admin/agency2portfolio.php
@@ -1,1 +1,42 @@
+<?php
 
+// Returns portfolio scraped live from directory.gov.au
+// or null if can't find a portfolio
+function agency2portfolio ($agency) {
+	static $cache = array();
+	if (isset($cache[$agency])) { return $cache[$agency]; }
+	$c = curl_init('http://www.directory.gov.au/searchres.php');
+	curl_setopt($c, CURLOPT_POST, true);
+	curl_setopt($c, CURLOPT_HEADER, false);
+	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($c, CURLOPT_REFERER, 'http://www.directory.gov.au/adsearch.php');
+	curl_setopt($c, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3');
+	curl_setopt($c, CURLOPT_POSTFIELDS, array(
+		'advkeywordfield' => '',
+		'advorgunitfield' => $agency,
+		'advrolefield' => '',
+		'advsection' => 'All',
+		'advsurnamefield' => '',
+		'search' => 'Submit Query'
+	));
+	$results = curl_exec($c);
+	
+	if (preg_match('#<span\s+class="standardlinks"><a\s+href="([^"]+)">#smi', $results, $m)) {
+		$nextURL = $m[1];
+	} else {
+		$cache[$agency] = false; return false;
+	}
+	
+	curl_setopt($c, CURLOPT_URL, 'http://www.directory.gov.au' . $nextURL);
+	curl_setopt($c, CURLOPT_HTTPGET, true);
+	curl_setopt($c, CURLOPT_REFERER, 'http://www.directory.gov.au/searchres.php');
+	$results = curl_exec($c);
+	if (preg_match('#portfolios:\s+([^<]+)#ims', $results, $m)) {
+		$cache[$agency] = $m[1]; return $m[1];
+	} else {
+		$cache[$agency] = false; return false;
+	}
+}
+
+?>
+

--- a/admin/convertToThematicMapping.php
+++ b/admin/convertToThematicMapping.php

--- /dev/null
+++ b/admin/displayRepresentatives.php
@@ -1,1 +1,7 @@
+SELECT representative_id,firstname,surname,party,house,division_id,	portfolio
+FROM portfolio2representative
+INNER JOIN representatives
+ON portfolio2representative.representative_id=representatives.id
+INNER JOIN portfolios
+ON portfolio2representative.portfolio_id=portfolios.id
 

--- /dev/null
+++ b/admin/displayUNSPSC.php
@@ -1,1 +1,25 @@
+<?php
+error_reporting(E_ALL);
+
+$link = mysql_connect('localhost', 'team7', 'wlUsnD2xu9');
+if (!$link) {
+    die('Could not connect: ' . mysql_error());
+}
+@mysql_select_db("team7") or die("Unable to select database");
+
+$unspscresult = mysql_query ("select * from UNSPSCcategories;");
+while ($row = mysql_fetch_assoc($unspscresult)) {
+	$unspsc[$row['UNSPSC']] = $row['Title'];
+}
+$catsresult = mysql_query ("SELECT LEFT( categoryUNSPSC, 2 ) as cat , SUM( value ) as value
+FROM `contractnotice`
+GROUP BY cat ;");
+echo "<table>";
+while ($row = mysql_fetch_assoc($catsresult)) {
+	$catName = $unspsc[$row['cat']."000000"].$row['cat'];
+	if ($row['cat'] = "") $catName = "null";
+	
+	echo "<tr><td>$catName</td><td>".$row['value']."</td></tr>";
+}
+?>
 

--- a/admin/google-example.php
+++ b/admin/google-example.php

--- a/admin/import.php
+++ b/admin/import.php
@@ -98,17 +98,17 @@
 	
 $result = mysql_query($contractNoticeInsert);
 if ($result) $success++;
-else echo $data[2] . " failed CN insert.<br>". mysql_error() ." <br>  $contractNoticeInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed CN insert.<br>". mysql_error() ." <br>  $contractNoticeInsert <br><br>\n";
 	
-	//$result = mysql_query($agencyInsert);
+	$result = mysql_query($agencyInsert);
 if ($result) $success++;
-else echo $data[2] . " failed agency insert.<br>". mysql_error() ." <br> $agencyInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed agency insert.<br>". mysql_error() ." <br> $agencyInsert <br><br>\n";
 	
 	$result = mysql_query($supplierInsert);
 if ($result) $success++;
-else echo $data[2] . " failed supplier insert.<br>". mysql_error() ." <br> $supplierInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed supplier insert.<br>". mysql_error() ." <br> $supplierInsert <br><br>\n";
 
-echo "<hr>\n";
+//echo "<hr>\n";
 	}
 	
     $row++;
@@ -117,3 +117,4 @@
 fclose($handle);
 }
 ?>
+

--- a/admin/linkAmendments.php
+++ b/admin/linkAmendments.php

--- a/admin/setAgencyStatus.php
+++ b/admin/setAgencyStatus.php

--- a/admin/setAgencyURLABN.php
+++ b/admin/setAgencyURLABN.php

--- /dev/null
+++ b/admin/updateReport.php
@@ -1,1 +1,30 @@
+<?php
+include_once("../lib/common.inc.php");
+$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` ORDER BY `importDate` DESC limit 1) alias)";
+$result = mysql_query($query);
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+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 
+FROM `contractnotice` WHERE (childCN != 0 OR parentCN != 0) AND DATE(importDate) in (select * from (SELECT DATE(importDate) 
+FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";
+$result = mysql_query($query);
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+echo $stats["count"] . " updated records in period " . $stats["start"] . "  to " . $stats["end"] ."<br>";
+
+$query = "SELECT count(*) as count FROM `agency` WHERE `abn` = '0'";
+$result = mysql_query($query);
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+echo $stats["count"] . " agencies with no ABN<br>";
+
+/*$query = "SELECT count(*) as count FROM `supplierdetails` WHERE `supplierABN` = '0' and supplierCountry LIKE 'Australia'";
+$result = mysql_query($query);
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+echo $stats["count"] . " Australian suppliers with no ABN<br>";*/
+
+
+echo "Last updated: ". $stats["importday"]."<br>";
+?>
 

--- /dev/null
+++ b/admin/updateUNSPSC.php
@@ -1,1 +1,38 @@
+<?php
+error_reporting(E_ALL);
+
+$link = mysql_connect('localhost', 'team7', 'wlUsnD2xu9');
+if (!$link) {
+    die('Could not connect: ' . mysql_error());
+}
+@mysql_select_db("team7") or die("Unable to select database");
+
+$unspscresult = mysql_query ("select * from UNSPSCcategories;");
+while ($row = mysql_fetch_assoc($unspscresult)) {
+	$unspsc[$row['Title']] = $row['UNSPSC'];
+}
+
+$query = "SELECT CNID,category,value
+FROM `contractnotice`
+WHERE `categoryUNSPSC` IS NULL OR `categoryUNSPSC` = 0";
+$emptycatresult = mysql_query ($query);
+$missing = Array();
+if ($emptycatresult){
+	while ($record = mysql_fetch_assoc($emptycatresult)) {
+	if ($unspsc[$record['category']] == "") {
+		$missing[$record['category']]= $missing[$record['category']]+ $record['value'];
+//		echo "<br>\n Category not found for: \n";
+//		print_r($record);
+	} else {
+	$result = mysql_query("UPDATE contractnotice SET categoryUNSPSC = 
+'".mysql_real_escape_string($unspsc[$record['category']])."' where CNID = 
+'".mysql_real_escape_string($record['CNID'])."';");
+	if ($result) echo $record['CNID']. " set to ". ($unspsc[$record['category']]) . " <br>\n";
+	else echo "error".mysql_error();
+	}
+	} 
+} else echo "error".mysql_error();
+asort($missing);
+print_r($missing);
+?>