From: Maxious <maxious@lambdacomplex.org>
Date: Wed, 05 Sep 2012 12:15:38 +0000
Subject: postgres migration
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=8d0ed32e28d234f8543b67fa4e1c2bd19d80f73a
---
postgres migration
---


--- a/admin/import.php
+++ b/admin/import.php
@@ -186,6 +186,8 @@
 
     flush();
     // run post import data processing
+    // 
+$dbConn->exec("update datasets set \"lastUpdated\" = NOW() where title = 'Contract Notices'");
 // cn
     echo "link amend<br>";
     include ("linkAmendments.php");

--- a/displayConfidentialities.php
+++ b/displayConfidentialities.php
@@ -10,9 +10,9 @@
 */
 
 include_header("Confidentialities");
-$query = "SELECT value, procurementMethod
-FROM `contractnotice`
-GROUP BY procurementMethod ";
+$query = 'SELECT SUM(value) as value, "procurementMethod"
+FROM contractnotice
+GROUP BY "procurementMethod" ';
 
     $query = $conn->prepare($query);
     $query->execute();

--- a/displayConsultancies.php
+++ b/displayConsultancies.php
@@ -10,9 +10,9 @@
 */
 
 include_header("Consultancies");
-$query = "SELECT value, procurementMethod
-FROM `contractnotice`
-GROUP BY procurementMethod ";
+$query = 'SELECT SUM(value) as value, "procurementMethod"
+FROM contractnotice
+GROUP BY "procurementMethod" ';
 
 
     $query = $conn->prepare($query);

--- a/displayProcurementMethod.php
+++ b/displayProcurementMethod.php
@@ -10,10 +10,10 @@
 */
 
 include_header("Procurement Methods");
-$query = "SELECT SUM(value) as value, procurementMethod
-FROM `contractnotice`
-WHERE childCN is null
-GROUP BY procurementMethod ";
+$query = 'SELECT SUM(value) as value, "procurementMethod"
+FROM contractnotice
+WHERE "childCN" is null
+GROUP BY "procurementMethod"';
 
     $query = $conn->prepare($query);
     $query->execute();

--- a/search.php
+++ b/search.php
@@ -1,31 +1,35 @@
 <?php
+
 /*
- search ABNs
-search agency name
-search categories
-search supplier names
---search supplier postcodes/suburbs/cities--
-search CN number
-search description full text
-*/
+  search ABNs
+  search agency name
+  search categories
+  search supplier names
+  --search supplier postcodes/suburbs/cities--
+  search CN number
+  search description full text
+ */
 include('./lib/common.inc.php');
 if ($_REQUEST['searchID']) {
-$searchIDParts = explode("-",$_REQUEST['searchID']);
-$type = array_shift($searchIDParts);
-$host  = $_SERVER['HTTP_HOST'];
-$uri   = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
+    $searchIDParts = explode("-", $_REQUEST['searchID']);
+    $type = array_shift($searchIDParts);
+    $host = $_SERVER['HTTP_HOST'];
+    $uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
 
-if ($type == "agency") {
-header("Location: http://$host$uri/displayAgency.php?agency=".implode("-",$searchIDParts));
-}
-if ($type == "supplier") {
-header("Location: http://$host$uri/displaySupplier.php?supplier=".implode("-",$searchIDParts));
-}
-exit;
+    if ($type == "agency") {
+        header("Location: http://$host$uri/displayAgency.php?agency=" . implode("-", $searchIDParts));
+    }
+    if ($type == "supplier") {
+        header("Location: http://$host$uri/displaySupplier.php?supplier=" . implode("-", $searchIDParts));
+    }
+        if ($type == "cnid") {
+        header("Location: http://$host$uri/displayContract.php?CNID=" . implode("-", $searchIDParts));
+    }
+    exit;
 } else {
-include_header("Search Results");
-print_r($_REQUEST);
-include_footer();
+    include_header("Search Results");
+    print_r($_REQUEST);
+    include_footer();
 }
 ?>
 

--- a/search_autosuggest.php
+++ b/search_autosuggest.php
@@ -46,6 +46,21 @@
             "info" => htmlspecialchars("Government Agency - " . $row['count'] . " records")
         );
     }
+        $query = "SELECT \"CNID\", description, value FROM contractnotice
+WHERE to_tsvector('english', description) @@ to_tsquery('english', :input)";
+    $query = $conn->prepare($query);
+    $agencyName = $input . '%';
+    $query->bindParam(":input", $input);
+    $query->execute();
+    databaseError($conn->errorInfo());
+    foreach ($query->fetchAll() as $row) {
+        $count++;
+        $aResults[] = array(
+            "id" => "cnid-" . $row[0],
+            "value" => htmlspecialchars($row['description']),
+            "info" => htmlspecialchars("Contract Notice - Value ".$row['value'])
+        );
+    }
 }
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified