Fix more graphs
[contractdashboard.git] / admin / neo4jimporter / src / main / java / Importer.java
blob:a/admin/neo4jimporter/src/main/java/Importer.java -> blob:b/admin/neo4jimporter/src/main/java/Importer.java
--- a/admin/neo4jimporter/src/main/java/Importer.java
+++ b/admin/neo4jimporter/src/main/java/Importer.java
@@ -88,26 +88,26 @@
                     + " AND contractnotice.\"agencyName\" != 'Defence Materiel Organisation' GROUP BY contractnotice.\"agencyName\", "
                     + "  contractnotice.\"supplierABN\",contractnotice.\"supplierName\"");
             String previousAgency = "";
-GraphDatabaseService gds = inserter.getGraphDbService(); 
-HashMap<String,Long> supplierIDs = new HashMap<String,Long>();
-HashMap<String,Long> agencyIDs = new HashMap<String,Long>();
-        
+            GraphDatabaseService gds = inserter.getGraphDbService();
+            HashMap<String, Long> supplierIDs = new HashMap<String, Long>();
+            HashMap<String, Long> agencyIDs = new HashMap<String, Long>();
+
             // Loop through the result set
             while (rs.next()) {
                 long supplierID, agencyID;
                 String supplierKey;
-                    if (agencyIDs.get(rs.getString("agencyName")) == null) {
-                       Node myNode = gds.createNode(); 
-                        myNode.setProperty("Label", rs.getString("agencyName"));
-                          myNode.setProperty("type", "agency");
-                        agencyIDs.put(rs.getString("agencyName"), myNode.getId());
-                        if (myNode.getId() %100 == 0) {
-    System.out.println("Agency "+myNode.getId());
-}
-                    } 
-                       agencyID = agencyIDs.get(rs.getString("agencyName"));
-                
-                
+                if (agencyIDs.get(rs.getString("agencyName")) == null) {
+                    Node myNode = gds.createNode();
+                    myNode.setProperty("Label", rs.getString("agencyName"));
+                    myNode.setProperty("type", "agency");
+                    agencyIDs.put(rs.getString("agencyName"), myNode.getId());
+                    if (myNode.getId() % 100 == 0) {
+                        System.out.println("Agency " + myNode.getId());
+                    }
+                }
+                agencyID = agencyIDs.get(rs.getString("agencyName"));
+
+
                 if (rs.getString("supplierABN") != "0" && rs.getString("supplierABN") != "") {
                     supplierKey = rs.getString("supplierABN");
                 } else {
@@ -115,19 +115,19 @@
                 }
                 // inject some data 
                 if (supplierIDs.get(supplierKey) == null) {
-                    Node myNode = gds.createNode(); 
-                        myNode.setProperty("Label", rs.getString("supplierName"));
-                            myNode.setProperty("type", "supplier");
+                    Node myNode = gds.createNode();
+                    myNode.setProperty("Label", rs.getString("supplierName"));
+                    myNode.setProperty("type", "supplier");
                     supplierIDs.put(supplierKey, myNode.getId());
-                    if (myNode.getId() %1000 == 0) {
-    System.out.println("Supplier "+myNode.getId());
-}
+                    if (myNode.getId() % 1000 == 0) {
+                        System.out.println("Supplier " + myNode.getId());
+                    }
                 }
                 supplierID = supplierIDs.get(supplierKey);
 
 
                 long rel = inserter.createRelationship(agencyID, supplierID,
-                       DynamicRelationshipType.withName("KNOWS"), null);
+                        DynamicRelationshipType.withName("KNOWS"), null);
                 inserter.setRelationshipProperty(rel, "Weight", rs.getDouble("sum"));
 
             }
@@ -154,6 +154,4 @@
         indexProvider.shutdown();
         inserter.shutdown();
     }
-
-   
 }