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
@@ -30,7 +30,7 @@
"contractStart", "supplierName"
FROM contractnotice
WHERE "agencyName" = :agency
- ORDER BY "value" DESC';
+ ORDER BY "value" DESC limit 100';
$query = $conn->prepare($query);
$query->bindParam(":agency", $agency);
$query->execute();
--- 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();
--- /dev/null
+++ b/google676a414ad086cefb.html
@@ -1,1 +1,2 @@
+google-site-verification: google676a414ad086cefb.html
--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -105,7 +105,9 @@
$standardQ = ' "childCN" is null '; // AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010';
$start = 0.0;
-
+function local_url() {
+ return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/";
+}
function include_header($title) {
global $start;
?>
--- 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
--- a/sitemap.xml.php
+++ b/sitemap.xml.php
@@ -1,27 +1,13 @@
<?php
-include ('include/common.inc.php');
+include ('lib/common.inc.php');
$last_updated = date('Y-m-d',@filemtime('cbrfeed.zip'));
header("Content-Type: text/xml");
echo "<?xml version='1.0' encoding='UTF-8'?>";
echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n";
- echo " <url><loc>".curPageURL()."index.php</loc><priority>1.0</priority></url>\n";
+ echo " <url><loc>".local_url()."index.php</loc><priority>1.0</priority></url>\n";
foreach (scandir("./") as $file) {
- if (strpos($file,".php") !== false && $file != "index.php" && $file != "sitemap.xml.php") echo " <url><loc>".curPageURL()."$file</loc><priority>0.3</priority></url>\n";
+ if (strpos($file,".php") !== false && $file != "index.php" && $file != "sitemap.xml.php") echo " <url><loc>".local_url()."$file</loc><priority>0.3</priority></url>\n";
}
-foreach (getStops() as $stop) {
- echo " <url><loc>".curPageURL()."stop.php?stopid=".htmlspecialchars ($stop["stop_id"])."</loc>";
- echo "<lastmod>" . $last_updated . "</lastmod>";
- echo "<changefreq>monthly</changefreq>";
- echo "<priority>0.9</priority>";
- echo "</url>\n";
- }
-foreach (getRoutes() as $route) {
- echo " <url><loc>".curPageURL()."trip.php?routeid=".htmlspecialchars ($route["route_id"])."</loc>";
- echo "<lastmod>" . $last_updated . "</lastmod>";
- echo "<changefreq>monthly</changefreq>";
- echo "<priority>0.9</priority>";
- echo "</url>\n";
- }
echo '</urlset>';
?>