Fix autosuggest
[contractdashboard.git] / lib / common.inc.php
blob:a/lib/common.inc.php -> blob:b/lib/common.inc.php
--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -1,4 +1,6 @@
 <?php

+date_default_timezone_set("Australia/ACT");

+

 require_once ('jpgraph/jpgraph.php');

 require_once ('jpgraph/jpgraph_line.php');

 require_once ('jpgraph/jpgraph_log.php');

@@ -8,6 +10,7 @@
 require_once ('jpgraph/jpgraph_date.php');

 

 error_reporting(E_ALL ^ E_NOTICE);

+

 

 $link = mysql_connect('localhost', 'root', '');

 if (!$link) {

@@ -33,16 +36,17 @@
      $totale += array_sum_all($value);

   return $totale; 

  }

+// magic query modifiers

 $agency = mysql_real_escape_string(stripslashes($_REQUEST['agency']));

-if ($agency != "") $agencyQ = "agencyName = '" . $agency . "' AND";

+if ($agency != "") $agencyQ = "agencyName = '" . $agency . "' AND ";

 $supplier = mysql_real_escape_string(stripslashes($_REQUEST['supplier']));

 if ($supplier != "") {

   $supplierParts = explode("-", $supplier);

-  if ($supplierParts[0] > 0) $supplierQ = "supplierABN = '" . $supplierParts[0] . "' AND";

-  else $supplierQ = "supplierName LIKE '%" . $supplierParts[1] . "%' AND";

+  if ($supplierParts[0] > 0) $supplierQ = "supplierABN = '" . $supplierParts[0] . "' AND ";

+  else $supplierQ = "supplierName LIKE '%" . $supplierParts[1] . "%' AND ";

 }

 $year = mysql_real_escape_string(stripslashes($_REQUEST['year']));

-if ($year != "") $yearQ = "agencyName = '" . $agency . "' AND";

+if ($year != "") $yearQ = "YEAR(publishDate) = " . $year . " AND ";

 

 $start =0.0;

 

@@ -59,7 +63,7 @@
             <script type="text/javascript" src="lib/bsn.AutoSuggest_2.1.3_comp.js" charset="utf-8"></script>

 

 <link rel="stylesheet" href="autosuggest_inquisitor.css" type="text/css" media="screen" charset="utf-8" />

-            <script type="text/javascript" src="lib/jquery.js"></script>

+            <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>

 <script type="text/javascript">

 $(document).ready(function()

 {

@@ -86,6 +90,7 @@
             <a href="displayProcurementMethod.php">procurement method</a>

             <a href="displayConfidentialities.php">contractual confidentiality</a>

             <a href="displayConsultancies.php">consultancies</a>

+            <a href="displayAmendments.php">amendments</a>

             <a href="displayMap.php">postcodes</a>

             <div id="search"><form method="post" action="search.php" class="asholder">

 	<label for="searchKeyword">search</label>

@@ -106,7 +111,7 @@
              <div id="bd" role="main"> 

     <div id="yui-main"> 

         <div class="yui-b"><div class="yui-g">

-<?

+<?php

 $start = (float) array_sum(explode(' ',microtime())); 

 }

 

@@ -125,7 +130,9 @@
         </li>

         </ul> <br>        </div> </div>

      

-    <?

+    <?php

    echo '<div id="ft"><p>'."Processing time: ". sprintf("%.4f", ($end-$start))." seconds".'</p></div>'; 

-echo '</div> </body> </html>';

-} ?>
+   echo '</div> </body> </html>';

+} 

+?>

+