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/displayAgency.php
+++ b/displayAgency.php
@@ -3,11 +3,12 @@
include_once ("./lib/common.inc.php");
if ($_REQUEST['agency']) {
- include_header("Agency");
$agency = htmlentities(strip_tags($_REQUEST['agency']));
- //MethodCountGraph($agency);
- // CnCGraph($agency);
- //MethodValueGraph($agency);
+ include_header($agency);
+echo '<center><h1>'.$agency.'</h1></center>';
+// MethodCountGraph($agency);
+ // CnCGraph($agency);
+ // MethodValueGraph($agency);
/* biggest contracts
spending by year
spending by industry/category
--- 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/displayContract.php
+++ b/displayContract.php
@@ -1,7 +1,6 @@
<?php
include_once("./lib/common.inc.php");
-include_header("Contract");
$query = 'SELECT *
FROM contractnotice
WHERE "CNID" = :CNID LIMIT 1';
@@ -9,15 +8,25 @@
$query = $conn->prepare($query);
$query->bindParam(":CNID", $_REQUEST['CNID']);
$query->execute();
+$contractResult = $query->fetch(PDO::FETCH_ASSOC);
+if (!$contractResult) {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 404 Not Found");
+include_header("Contract Not Found");
+ echo "<center><h1>No Contract Notice with that ID found</h1></center>";
databaseError($conn->errorInfo());
-foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+} else {
+$description = ucsmart($contractResult["description"]);
+include_header($description);
+ echo '<center><h1>'.$description.'</h1></center>';
+databaseError($conn->errorInfo());
setlocale(LC_MONETARY, 'en_US');
- foreach (array_filter($row) as $key => $value) {
+ foreach (array_filter($contractResult) as $key => $value) {
echo "<b>$key</b> ";
switch ($key) {
case "supplierName":
case "supplierABN":
- echo '<a href="displaySupplier.php?supplier=' . $row['supplierABN'] . '-' . urlencode($row['supplierName']) . '">' . $value . "</a>";
+ echo '<a href="displaySupplier.php?supplier=' . $contractResult['supplierABN'] . '-' . urlencode($contractResult['supplierName']) . '">' . $value . "</a>";
break;
case "agencyName":
echo '<a href="displayAgency.php?agency=' . urlencode($value) . '">' . $value . "</a>";
@@ -26,11 +35,10 @@
echo "$" . number_format(doubleval($value), 2);
break;
default:
- echo str_replace(" ", "<br>", $value);
+ echo str_replace(" ", "<br>", ucsmart($value));
}
echo "<br>";
}
-}
echo '<br><a href="https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN' . $_REQUEST['CNID'] . '"> View original record @ tenders.gov.au</a><br>';
@@ -43,7 +51,7 @@
foreach ($query->fetchAll() as $r) {
echo "<b>{$r['heuristic_name']}</b>: {$r['heuristic_value']} (raw value: {$r['raw_value']}, mean: {$r['mean']}, stddev: {$r['stddev']})<br>";
}
-
+}
include_footer();
?>
--- 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/displaySupplier.php
+++ b/displaySupplier.php
@@ -3,8 +3,10 @@
include_once ("./lib/common.inc.php");
if ($_REQUEST['supplier']) {
- include_header("Supplier");
$supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
+ include_header(str_replace("%","",$supplierName));
+echo '<center><h1>'.str_replace("%","",$supplierName).'</h1></center>';
+
// MethodCountGraph($supplierS);
// CnCGraph($supplierS);
// MethodValueGraph($supplierS);
--- a/robots.txt
+++ b/robots.txt
@@ -1,3 +1,3 @@
User-agent: *
Disallow: /admin
-
+Sitemap: http://contracts.disclosurelo.gs/sitemap.xml.php
--- 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