From: Maxious <maxious@lambdacomplex.org>
Date: Wed, 05 Sep 2012 12:15:38 +0000
Subject: postgres migration
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=8d0ed32e28d234f8543b67fa4e1c2bd19d80f73a
---
postgres migration
---


--- 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();

--- 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,11 +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;
     ?>
@@ -150,7 +148,7 @@
                 {  
                     var sValidChars = "0123456789.-,";  
                     var Char;  
-                                  
+                          
                     /* Check the numeric part */  
                     for ( i=1 ; i<sData.length ; i++ )   
                     {   
@@ -160,7 +158,7 @@
                             return null;  
                         }  
                     }  
-                                  
+                          
                     /* Check prefixed by currency */  
                     if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' )  
                     {  
@@ -173,11 +171,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 );
@@ -188,11 +186,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 );
@@ -237,7 +235,7 @@
             </div><!-- /topbar -->
         </div><!-- /topbar-wrapper -->
         <script type="text/javascript">
-                        	
+                	
             var options_xml = {
                 script: function (input) { return "search_autosuggest.php?input="+input; },
                 varname:"input",
@@ -265,29 +263,9 @@
                 $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");
-
-
-
-            
+            ?>
+