--- 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 {
 

--- 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/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -100,9 +100,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;

 

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