From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 22 Sep 2012 12:40:45 +0000
Subject: amon-php!
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=b849c4e62a3ac4fe3c164dd06634142c7ae8a12c
---
amon-php!
---


--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,7 @@
 [submodule "lib/bubbletree"]
 	path = lib/bubbletree
 	url = https://github.com/okfn/bubbletree.git
+[submodule "lib/amon-php"]
+	path = lib/amon-php
+	url = https://github.com/martinrusev/amon-php.git
 

--- a/admin/neo4jimporter/pom.xml
+++ b/admin/neo4jimporter/pom.xml
@@ -7,7 +7,7 @@
   	<dependency>
   		<groupId>org.neo4j</groupId>
   		<artifactId>neo4j</artifactId>
-  		<version>1.6.1</version>
+  		<version>1.8.RC1</version>
   	</dependency>
   	<dependency>
     <groupId>postgresql</groupId>

--- a/admin/neo4jimporter/src/main/java/Importer.java
+++ b/admin/neo4jimporter/src/main/java/Importer.java
@@ -1,8 +1,4 @@
 
-import java.io.ObjectInputStream.GetField;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -10,7 +6,6 @@
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.HashMap;
-import java.util.Map;
 
 import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -18,9 +13,9 @@
 import org.neo4j.graphdb.index.BatchInserterIndex;
 import org.neo4j.graphdb.index.BatchInserterIndexProvider;
 import org.neo4j.helpers.collection.MapUtil;
+import org.neo4j.index.impl.lucene.LuceneBatchInserterIndexProvider;
 import org.neo4j.kernel.impl.batchinsert.BatchInserter;
 import org.neo4j.kernel.impl.batchinsert.BatchInserterImpl;
-import org.neo4j.index.impl.lucene.*;
 
 public class Importer {
 
@@ -84,8 +79,7 @@
             // Execute the query
             ResultSet rs = stmt.executeQuery("SELECT contractnotice.\"agencyName\", "
                     + "  contractnotice.\"supplierABN\",contractnotice.\"supplierName\",sum(value) as sum "
-                    + "FROM  public.contractnotice where contractnotice.\"agencyName\" != 'Department of Defence'"
-                    + " AND contractnotice.\"agencyName\" != 'Defence Materiel Organisation' GROUP BY contractnotice.\"agencyName\", "
+                    + "FROM  public.contractnotice  GROUP BY contractnotice.\"agencyName\", "
                     + "  contractnotice.\"supplierABN\",contractnotice.\"supplierName\"");
             String previousAgency = "";
             GraphDatabaseService gds = inserter.getGraphDbService();

--- a/displayAgency.php
+++ b/displayAgency.php
@@ -29,7 +29,7 @@
     $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
     "contractStart", "supplierName"
     FROM contractnotice
-    WHERE "agencyName" = :agency
+    WHERE "agencyName" like :agency
     ORDER BY "value" DESC limit 100';
     $query = $conn->prepare($query);
     $query->bindParam(":agency", $agency);

--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -2,11 +2,17 @@
 
 include_once("./lib/common.inc.php");
 
-include_header("Months and Years");
+
 
 if ($_REQUEST['month']) {
-    echo "<center><h1>" . $_REQUEST['month'] . "</h1></center>";
     $monthParts = explode("-", $_REQUEST['month']);
+    $year = $monthParts[1];
+    $month = $monthParts[0];
+    $monthName = date("F Y",  mktime(0,0,0,$month,1,$year));
+            
+    include_header($monthName);
+    echo "<center><h1>" . $monthName . "</h1></center>";
+    
     $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName"
     FROM contractnotice
     WHERE "childCN" is null
@@ -52,7 +58,7 @@
       Year/Month drilldown - largest contracts, agencies, suppliers
       count per month
       big picture graphs? */
-
+include_header("Months and Years");
 
     ContractStartingGraph();
     ContractPublishedGraph();

--- a/displayCategory.php
+++ b/displayCategory.php
@@ -1,7 +1,7 @@
 <?php
 include_once ("./lib/common.inc.php");
 if ($_REQUEST['category']) {
-    include_header("Category");
+    include_header($_REQUEST['category']." goods and services");
     echo "<center><h1>".$_REQUEST['category']."</h1></center>";
   $query = 'SELECT "CNID", description, value, "agencyName", category, "contractStart", "supplierName"
     FROM contractnotice

--- 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/displayContract.php
+++ b/displayContract.php
@@ -18,28 +18,58 @@
 } else {
 $description = ucsmart($contractResult["description"]);
 include_header($description);
- echo '<center><h1>'.$description.'</h1></center>';
+ echo '<center><h1>'.$description.'</h1></center>
+     <div about="http://contracts.disclosurelo.gs/displayContract.php?CNID='.$contractResult["CNID"].'" typeof="pc:Contract">';
 databaseError($conn->errorInfo());
     setlocale(LC_MONETARY, 'en_US');
     foreach (array_filter($contractResult) as $key => $value) {
         echo "<b>$key</b>&nbsp;";
         switch ($key) {
+            case "supplierABN":
+            break;
             case "supplierName":
-            case "supplierABN":
-                echo '<a href="displaySupplier.php?supplier=' . $contractResult['supplierABN'] . '-' . urlencode($contractResult['supplierName']) . '">' . $value . "</a>";
+                echo '
+                    <a href="displaySupplier.php?supplier=' . $contractResult['supplierABN'] . '-' . urlencode($contractResult['supplierName']) . '">
+                        <span rel="pc:contractingAuthority" typeof="gr:BusinessEntity">
+                        <span property="gr:legalName">' 
+                    . $contractResult['supplierName'] . 
+                    '</span>'.
+                    (isset($contractResult['supplierABN']) && $contractResult['supplierABN'] != '' ? ' (ABN: <span property="br:officialNumber" lang="">'.$contractResult['supplierABN'].'</span>)' : '')
+                        .'</span></a>';
+                break;
+            case "CNID":
+                echo '<span property="pc:referenceNumber" lang="">'.$value.'</span>';
+                break;
+            case "categoryUNSPSC":
+                break;
+            case "category":
+                echo '<span rel="pc:mainObject" resource="[unspsc:'.$contractResult["categoryUNSPSC"].']">'.$value.'</span>';
                 break;
             case "agencyName":
                 echo '<a href="displayAgency.php?agency=' . urlencode($value) . '">' . $value . "</a>";
                 break;
+            case "contractStart":
+                echo '<span property="pc:startDate" content="'.$value.'" datatype="xsd:date">'.$value.'</span>';
+                break;
+            case "contractEnd":
+                echo '<span property="pc:endDate" content="'.$value.'" datatype="xsd:date">'.$value.'</span>';
+                break;
             case "value":
-                echo "$" . number_format(doubleval($value), 2);
+                echo '<span rel="pc:agreedPrice" typeof="gr:PriceSpecification">
+                     <span property="gr:hasCurrency" content="AUD" lang="">$ </span>
+                     <span property="gr:hasCurrencyValue" content="'.doubleval($value).'" datatype="xsd:float">' . number_format(doubleval($value), 2)
+                    .'</span></span>';
                 break;
+            case "description":
+                echo '<span property="dcterms:title">'.$value.'</span>';
             default:
                 echo str_replace("  ", "<br>", ucsmart($value));
         }
-        echo "<br>";
+        echo "<br>\n";
     }
-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>';
+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>
+    
+</div>';
 
 
 $query = 'SELECT * FROM heuristic_results where "CNID" = :CNID';

--- 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/lib/amon-php

--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -14,6 +14,11 @@
 if (strstr($_SERVER['PHP_SELF'], "labs/")) {
     $basePath = "../";
 }
+require $basePath."/lib/amon-php/amon.php";
+Amon::config(array('address'=> 'http://127.0.0.1:2465', 
+		'protocol' => 'http', 
+		'secret_key' => "g99127n3lkzigg8ob2rllth97d1pb4sj"));
+Amon::setup_exception_handler();
 
 require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
 $openid = new LightOpenID($_SERVER['HTTP_HOST']);
@@ -49,6 +54,7 @@
 function databaseError($errMsg) {
     if ($errMsg[2] != "") {
         echo '<div class="alert-message error">';
+        Amon::log(print_r($errMsg, true), array('error'));
         die(print_r($errMsg, true));
         echo "</div>";
     }
@@ -100,9 +106,9 @@
 
 $startYear = 2007;
 $year = filter_var($_REQUEST['year'], FILTER_SANITIZE_NUMBER_INT);
-if ($year != "")
+if ($year != "") {
     $yearQ = "YEAR(publishDate) = " . $year . " AND ";
-
+}
 $standardQ = ' "childCN" is null '; // AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010';
 $start = 0.0;
 
@@ -113,12 +119,32 @@
 function include_header($title) {
     global $start;
     ?>
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"  
-        "http://www.w3.org/TR/html4/strict.dtd"> 
-    <html>
+    <!DOCTYPE html>
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" version="XHTML+RDFa 1.1"
+       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+       xmlns:gr="http://purl.org/goodrelations/v1#"
+       xmlns:dc="http://purl.org/dc/terms/"
+       xmlns:pc="http://purl.org/procurement#"
+       xmlns:unspsc="http://www.ksl.stanford.edu/projects/DAML/UNSPSC.daml#"
+       xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+       xmlns:pcdt="http://purl.org/procurement/public-contracts-datatypes#"
+        prefix="rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns# 
+              rdfs: http://www.w3.org/2000/01/rdf-schema# 
+              gr: http://purl.org/goodrelations/v1# 
+              dcterms: http://purl.org/dc/terms/ 
+              pc: http://purl.org/procurement/public-contracts# 
+              cpv: http://purl.org/weso/pscs/cpv/2008/resource/ 
+              unspsc: http://www.ksl.stanford.edu/projects/DAML/UNSPSC.daml#
+              v: http://www.w3.org/2006/vcard/ns# 
+              payment: http://reference.data.gov.uk/def/payment# 
+              br: http://purl.org/business-register#              
+              xsd: http://www.w3.org/2001/XMLSchema# 
+              pcdt: http://purl.org/procurement/public-contracts-datatypes#">
         <head>
-            <title>Contract Dashboard - <?php echo $title; ?></title>
+            <title><?php echo $title; ?> - Contract Dashboard</title>
             <link rel="stylesheet" type="text/css" href="bootstrap.min.css"> 
+            <link rel="stylesheet" type="text/css" href="bootstrap-responsive.css"> 
             <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
             <!--[if lt IE 9]>
               <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -205,8 +231,8 @@
             <link type="text/css" rel="stylesheet" href="style.css">
         </head>
         <body>
-            <div class="topbar">
-                <div class="topbar-inner">
+            <div class="navbar">
+                <div class="navbar-inner">
                     <div class="container-fluid">
                         <a class="brand" href="#">contract dashboard</a>
                         <ul class="nav">
@@ -222,8 +248,6 @@
                             <li><a href="displayConsultancies.php">consultancies</a></li>
                             <li><a href="displayAmendments.php">amendments</a></li>
                             <li><a href="displayMap.php">geo</a></li>
-                            <!--  </ul>
-                          </li>-->
                         </ul>  
 
 
@@ -246,16 +270,14 @@
             var as_xml = new bsn.AutoSuggest('searchKeyword', options_xml);
         </script>
         <div class="container-fluid">
-            <div class="sidebar">
-                <div class="well">
-                    Filter by:<li>
-                    <li>year
-                    <li><li>2008</li>
-                    </li>
-                    </li>
-                    </li> <br>       
-                </div> </div>
-            <div class="content">
+            <div class="row-fluid">
+		<div class="span3">
+                	<div class="well sidebar-nav">
+                    		<li class="nav-header">Filter by:</li>
+                    		<li>2008</li>
+                	</div> 
+		</div>
+            	<div class="span9">
                 <?php
                 $start = (float) array_sum(explode(' ', microtime()));
             }
@@ -264,7 +286,7 @@
                 global $start;
                 $end = (float) array_sum(explode(' ', microtime()));
 
-                echo '  <footer>' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . '  <footer>';
+                echo '</div>  <footer>' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . '  <footer>';
 
                     if (strpos($_SERVER['SERVER_NAME'], ".gs")) {
                     ?>
@@ -290,4 +312,5 @@
 
 
 
-            
+            
+

--- a/lib/graphs.inc.php
+++ b/lib/graphs.inc.php
@@ -220,7 +220,7 @@
     global $conn;
     $agency = "AusAid";
     $topX = 15;
-    $query = 'SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE (extract ("YEAR" from "contractStart") >= :startYear) AND "childCN" is null AND "agencyName" = :agency
+    $query = 'SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE extract ("YEAR" from "contractStart") >= :startYear AND "childCN" is null AND "agencyName" like :agency
 GROUP BY lower(supplierName) ORDER BY val DESC limit $topX';
     $query = $conn->prepare($query);
     $query->bindParam(":startYear", $startYear);
@@ -235,7 +235,7 @@
     }
 
 
-    $query = 'SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE (extract ("YEAR" from "contractStart") >= :startYear) AND "childCN" is null and "agencyName" = :agency
+    $query = 'SELECT sum(a.val) as value, count(1) as count from (SELECT SUM(value) as val, "supplierName" FROM contractnotice WHERE (extract ("YEAR" from "contractStart") >= :startYear) AND "childCN" is null and "agencyName" like :agency
 GROUP BY lower("supplierName") ORDER BY val DESC LIMIT 18446744073709551610 OFFSET $topX) as a';
     $query = $conn->prepare($query);
     $query->bindParam(":startYear", $startYear);

--- a/style.css
+++ b/style.css
@@ -1,6 +1,3 @@
-body {
-   padding-top:60px;
-}
 /* div collapse from http://roshanbh.com.np/2008/03/expandable-collapsible-toggle-pane-jquery.html */
 p {
 padding: 0 0 1em;