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/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,9 +105,11 @@
 
 $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;
     ?>
@@ -148,7 +150,7 @@
                 {  
                     var sValidChars = "0123456789.-,";  
                     var Char;  
-                          
+                                  
                     /* Check the numeric part */  
                     for ( i=1 ; i<sData.length ; i++ )   
                     {   
@@ -158,7 +160,7 @@
                             return null;  
                         }  
                     }  
-                          
+                                  
                     /* Check prefixed by currency */  
                     if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' )  
                     {  
@@ -171,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 );
@@ -186,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 );
@@ -235,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",
@@ -263,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/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