From: Maxious <maxious@lambdacomplex.org>
Date: Tue, 21 Aug 2012 01:20:03 +0000
Subject: Add Google Analytics
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=56097201cec4f490fcd2038aaf80c98d58a5cdd1
---
Add Google Analytics
---


--- 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
@@ -29,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/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>&nbsp;";
         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/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);

--- /dev/null
+++ b/google676a414ad086cefb.html
@@ -1,1 +1,2 @@
+google-site-verification: google676a414ad086cefb.html
 

--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -10,12 +10,12 @@
     die("A database error occurred.\n");
 }
 
-define('ROOT' , pathinfo(__FILE__, PATHINFO_DIRNAME));
+define('ROOT', pathinfo(__FILE__, PATHINFO_DIRNAME));
 if (strstr($_SERVER['PHP_SELF'], "labs/")) {
     $basePath = "../";
 }
 
-require ROOT . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'openid.php';
+require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
 $openid = new LightOpenID($_SERVER['HTTP_HOST']);
 
 function login() {
@@ -105,6 +105,10 @@
 
 $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;
@@ -146,7 +150,7 @@
                 {  
                     var sValidChars = "0123456789.-,";  
                     var Char;  
-                          
+                                  
                     /* Check the numeric part */  
                     for ( i=1 ; i<sData.length ; i++ )   
                     {   
@@ -156,7 +160,7 @@
                             return null;  
                         }  
                     }  
-                          
+                                  
                     /* Check prefixed by currency */  
                     if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' )  
                     {  
@@ -169,11 +173,11 @@
                     /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */
                     var x = a == "-" ? 0 : a.replace( /,/g, "" );
                     var y = b == "-" ? 0 : b.replace( /,/g, "" );
-                	
+                        	
                     /* Remove the currency sign */
                     x = x.substring( 1 );
                     y = y.substring( 1 );
-                	
+                        	
                     /* Parse and return */
                     x = parseFloat( x );
                     y = parseFloat( y );
@@ -184,11 +188,11 @@
                     /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */
                     var x = a == "-" ? 0 : a.replace( /,/g, "" );
                     var y = b == "-" ? 0 : b.replace( /,/g, "" );
-                	
+                        	
                     /* Remove the currency sign */
                     x = x.substring( 1 );
                     y = y.substring( 1 );
-                	
+                        	
                     /* Parse and return */
                     x = parseFloat( x );
                     y = parseFloat( y );
@@ -233,7 +237,7 @@
             </div><!-- /topbar -->
         </div><!-- /topbar-wrapper -->
         <script type="text/javascript">
-                	
+                        	
             var options_xml = {
                 script: function (input) { return "search_autosuggest.php?input="+input; },
                 varname:"input",
@@ -261,9 +265,29 @@
                 $end = (float) array_sum(explode(' ', microtime()));
 
                 echo '  <footer>' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . '  <footer>';
+
+                    if (strpos($_SERVER['SERVER_NAME'], ".gs")) {
+                    ?>
+                    <script type="text/javascript">
+
+                        var _gaq = _gaq || [];
+                        _gaq.push(['_setAccount', 'UA-12341040-3']);
+                        _gaq.push(['_trackPageview']);
+
+                        (function() {
+                            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+                        })();
+
+                    </script>
+                    <?php
+                }
                 echo '</div> </div></body> </html>';
             }
 
             include ("graphs.inc.php");
-            ?>
-
+
+
+
+            

--- 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>';
 
 ?>