From: Alex Sadleir <maxious@lambdacomplex.org>
Date: Wed, 02 Apr 2014 02:28:56 +0000
Subject: naa import update
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=c1289bb746febc08b38df8942d0ac0f452cfdd00
---
naa import update
---


--- a/admin/neo4jimporter/.idea/misc.xml
+++ b/admin/neo4jimporter/.idea/misc.xml
@@ -13,7 +13,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK1.7" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK" />
   <component name="PyConsoleOptionsProvider">
     <option name="myPythonConsoleState">
       <PyConsoleSettings />
@@ -22,6 +22,7 @@
       <PyConsoleSettings />
     </option>
   </component>
+  <component name="RegexUtilComponent" text="1900-01-01 2007/08/13 1900.01.01 1900 01 01 1900-01.01 1900 13 01 1900 02 31" flags="0" regex="(19|20)\d\d([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])" mode="0" />
 </project>
 
 

--- a/admin/neo4jimporter/.idea/neo4jimporter.iml
+++ b/admin/neo4jimporter/.idea/neo4jimporter.iml
@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="JDK1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.neo4j:neo4j:2.0.0-M03" level="project" />
     <orderEntry type="library" name="Maven: org.neo4j:neo4j-kernel:2.0.0-M03" level="project" />

--- a/admin/neo4jimporter/.idea/workspace.xml
+++ b/admin/neo4jimporter/.idea/workspace.xml
@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ed822005-138f-4926-b199-24e1d82d9f3d" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/nbactions.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/Importer.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/JDBCExample.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../js/sigma" afterPath="$PROJECT_DIR$/../../js/sigma" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/StAXSample.java" afterPath="$PROJECT_DIR$/src/main/java/StAXSample.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/agency-sample.xml" afterPath="$PROJECT_DIR$/agency-sample.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="neo4jimporter.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -73,7 +70,7 @@
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="1110">
+            <state vertical-scroll-proportion="0.0" vertical-offset="721" max-vertical-offset="1258">
               <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
               <folding />
             </state>
@@ -83,30 +80,23 @@
       <file leaf-file-name="StAXSample.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/StAXSample.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5361991" vertical-offset="1143" max-vertical-offset="5715">
-              <caret line="92" column="44" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="44" />
+            <state vertical-scroll-proportion="0.5116279" vertical-offset="1426" max-vertical-offset="7174">
+              <caret line="102" column="65" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#609#623#0" expanded="true" />
-                <element signature="e#687#704#0" expanded="true" />
-                <element signature="e#813#827#0" expanded="true" />
-                <element signature="e#943#957#0" expanded="true" />
-                <element signature="e#1068#1082#0" expanded="true" />
-                <element signature="e#1638#1654#0" expanded="true" />
-                <element signature="e#3187#3203#0" expanded="true" />
-                <element signature="e#9229#9245#0" expanded="true" />
-                <element signature="e#9463#9479#0" expanded="true" />
-                <element signature="e#9684#9700#0" expanded="true" />
-                <element signature="e#11315#11331#0" expanded="true" />
-                <element signature="e#11520#11536#0" expanded="true" />
-                <element signature="e#12860#12876#0" expanded="true" />
-                <element signature="e#13065#13081#0" expanded="true" />
-                <element signature="e#14921#14937#0" expanded="true" />
-                <element signature="e#15130#15146#0" expanded="true" />
-                <element signature="e#16130#16131#0" expanded="true" />
-                <element signature="e#16196#16197#0" expanded="true" />
-                <element signature="e#16383#16384#0" expanded="true" />
-                <element signature="e#16423#16424#0" expanded="true" />
+                <element signature="e#10619#10635#0" expanded="true" />
+                <element signature="e#10853#10869#0" expanded="true" />
+                <element signature="e#11074#11090#0" expanded="true" />
+                <element signature="e#13031#13047#0" expanded="true" />
+                <element signature="e#13236#13252#0" expanded="true" />
+                <element signature="e#14578#14594#0" expanded="true" />
+                <element signature="e#14783#14799#0" expanded="true" />
+                <element signature="e#16639#16655#0" expanded="true" />
+                <element signature="e#16848#16864#0" expanded="true" />
+                <element signature="e#18180#18181#0" expanded="true" />
+                <element signature="e#18246#18247#0" expanded="true" />
+                <element signature="e#18461#18462#0" expanded="true" />
+                <element signature="e#18501#18502#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -138,10 +128,11 @@
       </MavenImportingSettings>
     </option>
   </component>
+  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="y" value="22" />
-    <option name="width" value="1608" />
-    <option name="height" value="874" />
+    <option name="x" value="-1916" />
+    <option name="width" value="1916" />
+    <option name="height" value="1031" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
@@ -169,6 +160,7 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -230,7 +222,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -252,6 +243,18 @@
     <property name="LayoutCode.rearrangeEntriesJava" value="false" />
     <property name="recentsLimit" value="5" />
     <property name="dynamic.classpath" value="false" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+  </component>
+  <component name="Regex">
+    <option name="pos1" value="218" />
+    <option name="pos2" value="218" />
+    <option name="pos3" value="162" />
+    <option name="pos4" value="444" />
+    <option name="pos5" value="162" />
+    <option name="autoUpdate" value="true" />
+    <option name="referenceOn" value="false" />
+    <option name="referencePos" value="0" />
+    <option name="showLabels" value="true" />
   </component>
   <component name="RunManager" selected="Application.StAXSample">
     <configuration default="false" name="StAXSample" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
@@ -277,6 +280,10 @@
       <ConfigurationWrapper RunnerId="Run" />
       <method />
     </configuration>
+    <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+      <TestRunner />
+      <method />
+    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -285,7 +292,24 @@
       <option name="PORT" value="5005" />
       <method />
     </configuration>
+    <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
+      <method />
+    </configuration>
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+      <method />
+    </configuration>
+    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
+      <option name="BCName" value="" />
+      <option name="launcherParameters">
+        <LauncherParameters>
+          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+          <option name="launcherType" value="OSDefault" />
+          <option name="newPlayerInstance" value="false" />
+          <option name="playerPath" value="FlashPlayerDebugger.exe" />
+        </LauncherParameters>
+      </option>
+      <option name="moduleName" value="" />
+      <option name="trusted" value="true" />
       <method />
     </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
@@ -299,6 +323,9 @@
       <option name="VM_PARAMETERS" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">
       <method />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
@@ -314,6 +341,44 @@
       <option name="PASS_PARENT_ENVS" value="true" />
       <module name="" />
       <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
+      <method />
+    </configuration>
+    <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
+      <option name="BCName" value="" />
+      <option name="IOSSimulatorSdkPath" value="" />
+      <option name="adlOptions" value="" />
+      <option name="airProgramParameters" value="" />
+      <option name="appDescriptorForEmulator" value="Android" />
+      <option name="debugTransport" value="USB" />
+      <option name="debuggerSdkRaw" value="BC SDK" />
+      <option name="emulator" value="NexusOne" />
+      <option name="emulatorAdlOptions" value="" />
+      <option name="fastPackaging" value="true" />
+      <option name="fullScreenHeight" value="0" />
+      <option name="fullScreenWidth" value="0" />
+      <option name="launchUrl" value="false" />
+      <option name="launcherParameters">
+        <LauncherParameters>
+          <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+          <option name="launcherType" value="OSDefault" />
+          <option name="newPlayerInstance" value="false" />
+          <option name="playerPath" value="FlashPlayerDebugger.exe" />
+        </LauncherParameters>
+      </option>
+      <option name="mobileRunTarget" value="Emulator" />
+      <option name="moduleName" value="" />
+      <option name="overriddenMainClass" value="" />
+      <option name="overriddenOutputFileName" value="" />
+      <option name="overrideMainClass" value="false" />
+      <option name="runTrusted" value="true" />
+      <option name="screenDpi" value="0" />
+      <option name="screenHeight" value="0" />
+      <option name="screenWidth" value="0" />
+      <option name="url" value="http://" />
+      <option name="usbDebugPort" value="7936" />
       <method />
     </configuration>
     <list size="1">
@@ -354,29 +419,34 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1608" height="874" extended-state="0" />
+    <frame x="-1916" y="0" width="1916" height="1031" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39897698" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3985043" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32905984" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Regex Tester" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25287357" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Amazon EC2" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25314465" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32905984" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992327" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -394,21 +464,108 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
+    <MESSAGE value="moar neo4j fixes" />
+    <option name="LAST_COMMIT_MESSAGE" value="moar neo4j fixes" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/StAXSample.java</url>
-          <line>126</line>
-          <properties />
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-      <option name="time" value="2" />
+      <option name="time" value="12" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="721" max-vertical-offset="1258">
+          <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/StAXSample.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1272" max-vertical-offset="6732">
+          <caret line="89" column="72" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#10619#10635#0" expanded="true" />
+            <element signature="e#10853#10869#0" expanded="true" />
+            <element signature="e#11074#11090#0" expanded="true" />
+            <element signature="e#13031#13047#0" expanded="true" />
+            <element signature="e#13236#13252#0" expanded="true" />
+            <element signature="e#14578#14594#0" expanded="true" />
+            <element signature="e#14783#14799#0" expanded="true" />
+            <element signature="e#16639#16655#0" expanded="true" />
+            <element signature="e#16848#16864#0" expanded="true" />
+            <element signature="e#18180#18181#0" expanded="true" />
+            <element signature="e#18246#18247#0" expanded="true" />
+            <element signature="e#18461#18462#0" expanded="true" />
+            <element signature="e#18501#18502#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1258">
+          <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/StAXSample.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1564" max-vertical-offset="6409">
+          <caret line="92" column="44" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="44" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#10619#10635#0" expanded="true" />
+            <element signature="e#10853#10869#0" expanded="true" />
+            <element signature="e#11074#11090#0" expanded="true" />
+            <element signature="e#13031#13047#0" expanded="true" />
+            <element signature="e#13236#13252#0" expanded="true" />
+            <element signature="e#14578#14594#0" expanded="true" />
+            <element signature="e#14783#14799#0" expanded="true" />
+            <element signature="e#16639#16655#0" expanded="true" />
+            <element signature="e#16848#16864#0" expanded="true" />
+            <element signature="e#18180#18181#0" expanded="true" />
+            <element signature="e#18246#18247#0" expanded="true" />
+            <element signature="e#18461#18462#0" expanded="true" />
+            <element signature="e#18501#18502#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1258">
+          <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/StAXSample.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1564" max-vertical-offset="6477">
+          <caret line="92" column="44" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="44" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#10619#10635#0" expanded="true" />
+            <element signature="e#10853#10869#0" expanded="true" />
+            <element signature="e#11074#11090#0" expanded="true" />
+            <element signature="e#13031#13047#0" expanded="true" />
+            <element signature="e#13236#13252#0" expanded="true" />
+            <element signature="e#14578#14594#0" expanded="true" />
+            <element signature="e#14783#14799#0" expanded="true" />
+            <element signature="e#16639#16655#0" expanded="true" />
+            <element signature="e#16848#16864#0" expanded="true" />
+            <element signature="e#18180#18181#0" expanded="true" />
+            <element signature="e#18246#18247#0" expanded="true" />
+            <element signature="e#18461#18462#0" expanded="true" />
+            <element signature="e#18501#18502#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1110">
@@ -421,11 +578,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="180">
           <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <element signature="tag#AGENCY#0;tag#AGENCIES#0" expanded="false" />
-            <element signature="tag#AGENCY#1;tag#AGENCIES#0" expanded="false" />
-            <element signature="tag#AGENCY#2;tag#AGENCIES#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -433,11 +586,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0397878" vertical-offset="0" max-vertical-offset="754">
           <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <element signature="tag#AGENCY#0;tag#AGENCIES#0" expanded="false" />
-            <element signature="tag#AGENCY#1;tag#AGENCIES#0" expanded="false" />
-            <element signature="tag#AGENCY#2;tag#AGENCIES#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -451,30 +600,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/StAXSample.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5361991" vertical-offset="1143" max-vertical-offset="5715">
-          <caret line="92" column="44" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="44" />
+        <state vertical-scroll-proportion="0.5116279" vertical-offset="1426" max-vertical-offset="7174">
+          <caret line="102" column="65" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#609#623#0" expanded="true" />
-            <element signature="e#687#704#0" expanded="true" />
-            <element signature="e#813#827#0" expanded="true" />
-            <element signature="e#943#957#0" expanded="true" />
-            <element signature="e#1068#1082#0" expanded="true" />
-            <element signature="e#1638#1654#0" expanded="true" />
-            <element signature="e#3187#3203#0" expanded="true" />
-            <element signature="e#9229#9245#0" expanded="true" />
-            <element signature="e#9463#9479#0" expanded="true" />
-            <element signature="e#9684#9700#0" expanded="true" />
-            <element signature="e#11315#11331#0" expanded="true" />
-            <element signature="e#11520#11536#0" expanded="true" />
-            <element signature="e#12860#12876#0" expanded="true" />
-            <element signature="e#13065#13081#0" expanded="true" />
-            <element signature="e#14921#14937#0" expanded="true" />
-            <element signature="e#15130#15146#0" expanded="true" />
-            <element signature="e#16130#16131#0" expanded="true" />
-            <element signature="e#16196#16197#0" expanded="true" />
-            <element signature="e#16383#16384#0" expanded="true" />
-            <element signature="e#16423#16424#0" expanded="true" />
+            <element signature="e#10619#10635#0" expanded="true" />
+            <element signature="e#10853#10869#0" expanded="true" />
+            <element signature="e#11074#11090#0" expanded="true" />
+            <element signature="e#13031#13047#0" expanded="true" />
+            <element signature="e#13236#13252#0" expanded="true" />
+            <element signature="e#14578#14594#0" expanded="true" />
+            <element signature="e#14783#14799#0" expanded="true" />
+            <element signature="e#16639#16655#0" expanded="true" />
+            <element signature="e#16848#16864#0" expanded="true" />
+            <element signature="e#18180#18181#0" expanded="true" />
+            <element signature="e#18246#18247#0" expanded="true" />
+            <element signature="e#18461#18462#0" expanded="true" />
+            <element signature="e#18501#18502#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -531,7 +673,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>Android 4.2 Platform</last-edited>
+          <last-edited>1.7</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>

--- a/admin/neo4jimporter/src/main/java/StAXSample.java
+++ b/admin/neo4jimporter/src/main/java/StAXSample.java
@@ -77,21 +77,51 @@
 
 
                 //iterate as long as there are more events on the input stream
+                Map<String, Object> previousAgency = new HashMap<String, Object>();
                 while (r.hasNext()) {
                     XMLEvent e = r.nextEvent();
-                    Map<String, Object> previousAgency = new HashMap<String, Object>();
+
                     if (e.isStartElement()) {
                         if (hasStartTagName(e, "AGENCIES")) {
                             System.out.println("Agencies file loaded... ");
+                        } else if (hasStartTagName(e, "AGENCY_NO")) {
+                            previousAgency.put("agency_no", getCharacters(r));
                         } else if (hasStartTagName(e, "TITLE")) {
-                            System.out.println("TITLE is: " + getCharacters(r));
-                            previousAgency.put("title", getCharacters(r));
+                            String title = getCharacters(r);
+                            previousAgency.put("name", title);
+                            previousAgency.put("label", title);
+                        } else if (hasStartTagName(e, "START_DATE")) {
+                            String start_date = getCharacters(r);
+                            if (start_date != null && !start_date.equals(" ") && !start_date.equals("(null)")) {
+                                previousAgency.put("start_date", Integer.parseInt(start_date));
+                            }
+                        } else if (hasStartTagName(e, "START_DATE_QUAL")) {
+                            previousAgency.put("start_date_qual", getCharacters(r));
+                        } else if (hasStartTagName(e, "ALTERNATIVE_TITLE")) {
+                            previousAgency.put("alternative_title", getCharacters(r));
+                        } else if (hasStartTagName(e, "END_DATE")) {
+                            String end_date = getCharacters(r);
+                            if (end_date != null && !end_date.equals(" ") && !end_date.equals("(null)")) {
+                                previousAgency.put("end_date", Integer.parseInt(end_date));
+                            }
                         } else if (hasStartTagName(e, "END_DATE_QUAL")) {
-                            System.out.println("END_DATE_QUAL is: " + getCharacters(r));
                             previousAgency.put("end_date_qual", getCharacters(r));
                             // save agency
                             getAgency(previousAgency);
                             previousAgency = new HashMap<String, Object>();
+                        }
+                    }
+                }
+                r = xmlif.createXMLEventReader(
+                        filename,
+                        //new FileInputStream(new File(xmlFileURL.toURI())));
+                        new FileInputStream(new File(filename)));
+                while (r.hasNext()) {
+                    XMLEvent e = r.nextEvent();
+
+                    if (e.isStartElement()) {
+                        if (hasStartTagName(e, "AGENCIES")) {
+                            System.out.println("Agencies file loaded again... ");
                         } else if (hasStartTagName(e, "AGENCY_LINK")) {
                             processAgencyLink(r);
                         } else if (hasStartTagName(e, "AGENCY_LOCATION")) {
@@ -100,8 +130,17 @@
                             processAgencyFunction(r);
                         } else if (hasStartTagName(e, "AGENCY_STATUS")) {
                             processAgencyStatus(r);
-                        } else {
-                            System.out.println("Unhandled tag: " + getStartTagName(e) + " content:" + getCharacters(r));
+                            /* TODO
+                            Unhandled tag: AGENCY_NOTE content:
+
+Unhandled tag: NOTE_AGENCY_NO content:CA 4886
+Unhandled tag: NOTE_TYPE content:Archivists note
+Unhandled tag: NOTE content:null
+Unhandled tag: head content:
+
+Unexpected character 'C' (code 67) in start tag Expected a quote
+ at [row,col,system-id]: [1093387,18,"agency-sample.xml"]
+                             */
                         }
                     }
                 }
@@ -124,19 +163,25 @@
     }
 
     private long getAgency(Map<String, Object> properties) {
+        if (properties.get("agency_no") == null || properties.get("agency_no") == "(null)" || properties.get("agency_no") == " ") {
+            return 0;
+        }
         if (agencyIDs.get(properties.get("agency_no").toString()) == null) {
             long agencyID = inserter.createNode(properties, agencyLabel);
-            if (properties.values().size() > 2) {
+            /*if (properties.values().size() > 1) {
                 agencyFullVersion.put(properties.get("agency_no").toString(), true);
-            }
+            } */
             agencyIDs.put(properties.get("agency_no").toString(), agencyID);
+            //if (agencyID % 10 == 0) {
+                System.out.println("Agency #"+agencyID);
+            //}
             return agencyID;
         } else {
             long agencyID = agencyIDs.get(properties.get("agency_no").toString());
-            if (properties.values().size() > 2 && agencyFullVersion.get(properties.get("agency_no")) == null) {
+            /*if (properties.values().size() > 1 && agencyFullVersion.get(properties.get("agency_no")) == null) {
                 inserter.setNodeProperties(agencyID, properties);
                 agencyFullVersion.put(properties.get("agency_no").toString(), true);
-            }
+            } */
             return agencyID;
         }
     }
@@ -144,7 +189,8 @@
     private long getLocation(String locationName) {
         if (locationIDs.get(locationName) == null) {
             HashMap properties = new HashMap< String,Object > ();
-            properties.put("location_name", locationName);
+            properties.put("name", locationName);
+            properties.put("label", locationName);
             long locationID = inserter.createNode(properties, locationLabel);
             locationIDs.put(locationName, locationID);
             return locationID;
@@ -155,7 +201,8 @@
     private long getFunction(String functionName) {
         if (functionIDs.get(functionName) == null) {
             HashMap properties = new HashMap< String,Object > ();
-            properties.put("function_name", functionName);
+            properties.put("name", functionName);
+            properties.put("label", functionName);
             long functionID = inserter.createNode(properties, functionLabel);
             functionIDs.put(functionName, functionID);
             return functionID;
@@ -166,7 +213,8 @@
     private long getStatus(String statusName) {
         if (statusIDs.get(statusName) == null) {
             HashMap properties = new HashMap< String,Object > ();
-            properties.put("status_name", statusName);
+            properties.put("name", statusName);
+            properties.put("label", statusName);
             long statusID = inserter.createNode(properties, statusLabel);
             statusIDs.put(statusName, statusID);
             return statusID;
@@ -206,24 +254,34 @@
             if (e.isEndElement()) {
                 if (hasEndTagName(e, "AGENCY_LINK")) {
 
-                    //System.out.println("Finished processing link:  Name = " + name + "; of = " + of + "; date = " + date);
-                    long agencyFromID, agencyToID;
-                    Map<String, Object> agencyFromProperties = new HashMap<String, Object>();
-                    agencyFromProperties.put("agency_no",agency_from_no);
-                    agencyFromID = getAgency(agencyFromProperties);
-                    Map<String, Object> agencyToProperties = new HashMap<String, Object>();
-                    agencyToProperties.put("agency_no",agency_to_no);
-                    agencyToID = getAgency(agencyToProperties);
-                    Map<String, Object> relProperties = new HashMap<String, Object>();
-                    relProperties.put("link_type", link_type);
-                    relProperties.put("start_date", start_date);
-                    relProperties.put("start_date_qual", start_date_qual);
-                    relProperties.put("end_date", end_date);
-                    relProperties.put("end_date_qual", end_date_qual);
-                    inserter.createRelationship(agencyFromID, agencyToID,
-                            DynamicRelationshipType.withName("IS_LINKED_TO"), relProperties);
-
-                    break;
+                    //System.out.println("Finished processing link:  type = " + link_type+ "; from = " + agency_from_no + "; to = " + agency_to_no);
+                    if (agency_to_no != null && !agency_to_no.equals("(null)")) {
+                        long agencyFromID, agencyToID;
+                        Map<String, Object> agencyFromProperties = new HashMap<String, Object>();
+                        agencyFromProperties.put("agency_from_no", agency_from_no);
+                        agencyFromID = getAgency(agencyFromProperties);
+                        Map<String, Object> agencyToProperties = new HashMap<String, Object>();
+                        agencyToProperties.put("agency_to_no", agency_to_no);
+                        agencyToID = getAgency(agencyToProperties);
+                        Map<String, Object> relProperties = new HashMap<String, Object>();
+                        relProperties.put("link_type", link_type);
+                        if (start_date != null && !start_date.equals("(null)")) {
+                            relProperties.put("start_date", Integer.parseInt(start_date));
+                        }
+                        if (start_date_qual != null && !start_date_qual.equals("(null)")) {
+                            relProperties.put("start_date_qual", start_date_qual);
+                        }
+                        if (end_date != null && !end_date.equals("(null)")) {
+                            relProperties.put("end_date", Integer.parseInt(end_date));
+                        }
+                        if (end_date_qual != null && !end_date_qual.equals("(null)")) {
+                            relProperties.put("end_date_qual", end_date_qual);
+                        }
+                        inserter.createRelationship(agencyFromID, agencyToID,
+                                DynamicRelationshipType.withName("IS_LINKED_TO"), relProperties);
+                    }
+                        break;
+
                 }
             }
         }
@@ -247,14 +305,14 @@
             }
             if (e.isEndElement()) {
                 if (hasEndTagName(e, "AGENCY_LOCATION")) {
-                    System.out.println("Finished processing location:  Name = " + name + "; of = " + of + "; date = " + date);
+                    //System.out.println("Finished processing location:  Name = " + name + "; of = " + of + "; date = " + date);
                     long locationID, agencyID;
                     locationID = getLocation(name);
                     Map<String, Object> agencyProperties = new HashMap<String, Object>();
                     agencyProperties.put("agency_no",of);
                     agencyID = getAgency(agencyProperties);
                     Map<String, Object> relProperties = new HashMap<String, Object>();
-                    relProperties.put("date", date);
+                    relProperties.put("date", fixDate(date));
                     inserter.createRelationship(agencyID, locationID,
                             DynamicRelationshipType.withName("HAS_LOCATION"), relProperties);
 
@@ -282,14 +340,14 @@
             }
             if (e.isEndElement()) {
                 if (hasEndTagName(e, "AGENCY_STATUS")) {
-                    System.out.println("Finished processing status:  Status = " + status + "; of = " + of + "; date = " + date);
+                    //System.out.println("Finished processing status:  Status = " + status + "; of = " + of + "; date = " + date);
                     long statusID, agencyID;
                             statusID = getStatus(status);
                     Map<String, Object> agencyProperties = new HashMap<String, Object>();
                     agencyProperties.put("agency_no",of);
                     agencyID = getAgency(agencyProperties);
                     Map<String, Object> relProperties = new HashMap<String, Object>();
-                    relProperties.put("date", date);
+                    relProperties.put("date", fixDate(date));
                     inserter.createRelationship(agencyID, statusID,
                             DynamicRelationshipType.withName("HAS_STATUS"), relProperties);
 
@@ -333,10 +391,16 @@
                     agencyProperties.put("agency_no",agency);
                     agencyID = getAgency(agencyProperties);
                     Map<String, Object> relProperties = new HashMap<String, Object>();
-                                        relProperties.put("start_date", start_date);
-                    relProperties.put("start_date_qual", start_date_qual);
-                    relProperties.put("end_date", end_date);
-                    relProperties.put("end_date_qual", end_date_qual);
+                    relProperties.put("start_date", Integer.parseInt(start_date));
+                    if (start_date_qual != null && !start_date_qual.equals("(null)")) {
+                        relProperties.put("start_date_qual", start_date_qual);
+                    }
+                    if (end_date != null && !end_date.equals("(null)")) {
+                        relProperties.put("end_date", Integer.parseInt(end_date));
+                    }
+                    if (end_date_qual != null && !end_date_qual.equals("(null)")) {
+                        relProperties.put("end_date_qual", end_date_qual);
+                    }
                     inserter.createRelationship(agencyID, functionID,
                             DynamicRelationshipType.withName("HAS_FUNCTION"), relProperties);
 
@@ -345,7 +409,14 @@
             }
         }
     }
-
+    private int fixDate(String date) {
+        String[] parts = date.split("-");
+        if (parts.length == 3) {
+            return Integer.parseInt(""+parts[2]+parts[1]+parts[0]);
+        } else {
+            return 0;
+        }
+    }
     private String getCharacters(XMLEventReader rdr) throws XMLStreamException {
         XMLEvent e = rdr.nextEvent();
         if (e.isCharacters()) {
@@ -356,15 +427,11 @@
     }
 
     private boolean hasStartTagName(XMLEvent e, String name) {
-        return e.asStartElement().getName().getLocalPart().equals(name);
-    }
-
-    private String getStartTagName(XMLEvent e) {
-        return e.asStartElement().getName().getLocalPart();
+        return e.asStartElement().getName().getLocalPart().toLowerCase().equals(name.toLowerCase());
     }
 
     private boolean hasEndTagName(XMLEvent e, String name) {
-        return e.asEndElement().getName().getLocalPart().equals(name);
+        return e.asEndElement().getName().getLocalPart().toLowerCase().equals(name.toLowerCase());
     }
 
     public void setFilename(String filename) {
@@ -374,3 +441,4 @@
 
 }
 
+

--- /dev/null
+++ b/admin/time.php
@@ -1,1 +1,164 @@
+<?php
 
+
+// https://github.com/jadell/neo4jphp
+spl_autoload_register(function ($className) {
+    $libPath = '../lib/neo4jphp/lib/';
+    $classFile = str_replace('\\',DIRECTORY_SEPARATOR,$className).'.php';
+    $classPath = $libPath.$classFile;
+    if (file_exists($classPath)) {
+        require($classPath);
+    }
+});
+
+$nodes = "";
+$edges = "";
+$description = "";
+$nodeList = Array();
+
+function add_node($node) {
+    global $nodes,$nodeList;
+    if (!in_array($node->getId(),$nodeList)) {
+        $start = $node->getProperty("start_date") . $node->getProperty("date");
+        $end = $node->getProperty("end_date");
+        $nodes.= "<node id='".urlencode($node->getId())."'". ' label="'.htmlentities($node->getProperty("name")).'" '
+            . ($start != ""? 'start="'.$start.'" ' : ""). ($end != ""? 'end="'.$end.'" ' : "").'>'
+            ."<viz:color b='".rand(0,255)."' g='".rand(0,255)."' r='".rand(0,255)."'/>"
+            ."</node>". PHP_EOL;
+        $nodeList[] = $node->getId();
+    }
+}
+
+function add_edge($rel) {
+    global $edges;
+    $start = $rel->getProperty("start_date");
+    $end = $rel->getProperty("end_date");
+    $edges.= "<edge id='".urlencode($rel->getId())."' source='".urlencode($rel->getStartNode()->getId())."' target='".urlencode($rel->getEndNode()->getId())."' ".($start != ""? 'start="'.$start.'" ' : ""). ($end != ""? 'end="'.$end.'" ' : "")."/>". PHP_EOL;
+
+}
+
+function expandNode($node) {
+    //global $description;
+    //$description .= ($description == ""? "" : " and ").$node->getProperty("name");
+    add_node($node);
+
+    foreach ($node->getProperties() as $key => $value) {
+        // echo "$key: $value\n";
+    }
+    foreach ($node->getRelationships() as $rel) {
+        //echo($rel->getStartNode()->getId()." -> ".$rel->getEndNode()->getId()."<br>");
+        add_edge($rel);
+        add_node($rel->getStartNode());
+        add_node($rel->getEndNode());
+    }
+}
+
+//$ids = (isset($_REQUEST['ids']) ? $_REQUEST['ids'] : "");
+
+// Connecting to the default port 7474 on localhost
+$client = new Everyman\Neo4j\Client();
+//$client = new Everyman\Neo4j\Client('192.168.1.127');
+//print_r($client->getServerInfo());
+
+//https://github.com/jadell/neo4jphp/wiki/Caching
+$plugin = new Everyman\Neo4j\Cache\Variable();
+$client->getEntityCache()->setCache($plugin);
+
+/*$memcached = new Memcached();
+$memcached->addServer('localhost', 11211);
+
+$plugin = new Everyman\Neo4j\Cache\Memcached($memcached);
+$client->getEntityCache()->setCache($plugin);*/
+
+/*$requests = explode(";",$ids);
+
+
+foreach ($requests as $request) {
+
+    // Array("type" => "path", from=>"1234", to=>"4321","options" => Array())
+
+    $parts = explode("-",$request);
+
+    $requestType = $parts[0];
+    $requestId = $parts[1];
+    if ($requestType == 'node') {
+        expandNode($client->getNode($requestId));
+    } else {
+        findNode($requestType,$requestId);
+    }
+}
+
+function findNode($type,$id) {
+    global $client;
+    $typeMapping = Array (
+        "agency" => Array("label" => "Agency", "id" => "agencyID")
+    );
+
+    $queryString =
+        "MATCH (n:".$typeMapping[$type]["label"].")".
+        "WHERE n.".$typeMapping[$type]["id"]." = {nodeId}".
+        "RETURN n";
+
+    $query = new Everyman\Neo4j\Cypher\Query($client, $queryString, array('nodeId' => $id));
+    $result = $query->getResultSet();
+
+    foreach ($result as $row) {
+        expandNode( $row[0]);
+
+    }
+
+}  */
+
+// https://github.com/jadell/neo4jphp/wiki/Paths
+
+/*  https://github.com/jadell/neo4jphp/wiki/Traversals
+ * $traversal = new Everyman\Neo4j\Traversal($client);
+$traversal->addRelationship('KNOWS', Relationship::DirectionOut)
+    ->setPruneEvaluator(Traversal::PruneNone)
+    ->setReturnFilter(Traversal::ReturnAll)
+    ->setMaxDepth(4);
+
+$nodes = $traversal->getResults($startNode, Traversal::ReturnTypeNode);
+
+ */
+
+/*https://github.com/jadell/neo4jphp/wiki/Cypher-and-gremlin-queries
+$queryString = "START n=node({nodeId}) ".
+ "MATCH (n)<-[:KNOWS]-(x)".
+ "WHERE x.name = {name}".
+ "RETURN x";
+$query = new Everyman\Neo4j\Cypher\Query($client, $queryString, array('nodeId' => 1, 'name' => 'Bob'));
+$result = $query->getResultSet();
+foreach ($result as $row) {
+ echo $row['x']->getProperty('name') . "\n";
+}*/
+
+$queryString =
+    "MATCH (n) WHERE has(n.start_date) and n.start_date < 18870000 RETURN n";
+  $description = '1887';
+$query = new Everyman\Neo4j\Cypher\Query($client, $queryString);
+$result = $query->getResultSet();
+
+foreach ($result as $row) {
+    expandNode( $row[0]);
+
+}
+
+if (!isset($_REQUEST['debug'])) {
+    header('Content-Type: application/gexf+xml');
+    header('Content-Disposition: attachment; filename="'.urlencode(str_replace(" ","_",strtolower($description))).'.gexf"');
+}
+echo '<?xml version="1.0" encoding="UTF-8"?>
+<gexf xmlns="http://www.gexf.net/1.2draft" xmlns:viz="http://www.gexf.net/1.2draft/viz" version="1.2">
+    <meta lastmodifieddate="2009-03-20">
+        <creator>lobbyist.disclosurelo.gs</creator>
+        <description>'. $description. '</description>
+    </meta>
+    <graph mode="dynamic" defaultedgetype="directed" timeformat="date">
+
+        <nodes>'. $nodes. '</nodes>
+        <edges>'. $edges.' </edges>
+    </graph>
+</gexf>'. PHP_EOL;
+
+?>

--- /dev/null
+++ b/admin/timeline.php
@@ -1,1 +1,149 @@
+<?php
+// START n=node(*) OPTIONAL MATCH n<-[r]-parent WITH n, count(parent) AS parents WHERE parents = 0 RETURN n, parents;
+// no parents
 
+// START n=node(*) OPTIONAL MATCH (n:Agency)-[r]->(child:Agency) WITH n, count(child) AS children WHERE children = 0 AND n:Agency RETURN n, children;
+// no children
+
+// MATCH (n) WHERE has(n.start_date) and n.start_date < 18870000 RETURN n
+// time slice
+if (isset($_REQUEST['json'])) {
+
+   /* echo '{
+    "timeline":
+    {
+        "headline":"The Main Timeline Headline Goes here",
+        "type":"default",
+        "text":"<p>Intro body text goes here, some HTML is ok</p>",
+        "asset": {
+            "media":"http://yourdomain_or_socialmedialink_goes_here.jpg",
+            "credit":"Credit Name Goes Here",
+            "caption":"Caption text goes here"
+        },
+        "date": [
+            {
+                "startDate":"2011,12,10",
+                "endDate":"2011,12,11",
+                "headline":"Headline Goes Here",
+                "text":"<p>Body text goes here, some HTML is OK</p>",
+                "tag":"This is Optional",
+                "classname":"optionaluniqueclassnamecanbeaddedhere",
+                "asset": {
+                    "media":"http://twitter.com/ArjunaSoriano/status/164181156147900416",
+                    "thumbnail":"optional-32x32px.jpg",
+                    "credit":"Credit Name Goes Here",
+                    "caption":"Caption text goes here"
+                }
+            }
+        ],
+        "era": [
+            {
+                "startDate":"2011,12,10",
+                "endDate":"2011,12,11",
+                "headline":"Headline Goes Here",
+                "text":"<p>Body text goes here, some HTML is OK</p>",
+                "tag":"This is Optional"
+            }
+
+        ]
+    }
+}';   */
+
+    // https://github.com/jadell/neo4jphp
+    spl_autoload_register(function ($className) {
+        $libPath = '../lib/neo4jphp/lib/';
+        $classFile = str_replace('\\',DIRECTORY_SEPARATOR,$className).'.php';
+        $classPath = $libPath.$classFile;
+        if (file_exists($classPath)) {
+            require($classPath);
+        }
+    });
+
+
+// Connecting to the default port 7474 on localhost
+    $client = new Everyman\Neo4j\Client();
+//$client = new Everyman\Neo4j\Client('192.168.1.127');
+//print_r($client->getServerInfo());
+
+
+
+
+    //https://github.com/jadell/neo4jphp/wiki/Cypher-and-gremlin-queries
+    $queryString = "MATCH (n) where has(n.agency_no) RETURN n LIMIT 1000";
+    $query = new Everyman\Neo4j\Cypher\Query($client, $queryString);
+    $dates = Array();
+    $result = $query->getResultSet();
+    foreach ($result as $row) {
+     //$dates[] = Array("startDate" =>"2011,12,10",   "endDate"=>"2011,12,11",        "headline"=>"Headline Goes Here",        "text"=>"<p>Body text goes here, some HTML is OK</p>");
+        $name = $row['x']->getProperty('name');
+        $startDate = $row['x']->getProperty('start_date');
+        $startDate = substr_replace($startDate, ",", 6, 0);
+        $startDate = substr_replace($startDate, ",", 4, 0);
+        $endDate = $row['x']->getProperty('end_date');
+        if ($endDate == " ") $endDate = "20140101";
+        $endDate = substr_replace($endDate, ",", 6, 0);
+        $endDate = substr_replace($endDate, ",", 4, 0);
+
+        $dates[] = Array("startDate" =>$startDate,   "endDate"=>$endDate,        "headline"=>$name,        "text"=>"<p>Body text goes here, some HTML is OK</p>");
+
+    }
+
+
+
+    $timeline = Array( "headline"=>"The Main Timeline Headline Goes here",
+        "type"=>"default",
+        "text"=>"<p>Intro body text goes here, some HTML is ok</p>","date"=>$dates);
+    echo json_encode(Array("timeline" => $timeline));
+    die();
+}
+?>
+
+     <!DOCTYPE html>
+     <html lang="en"><!--
+
+  	88888888888 d8b                        888 d8b                888888   d8888b
+  	    888     Y8P                        888 Y8P                   88b d88P  Y88b
+  	    888                                888                       888 Y88b
+  	    888     888 88888b d88b     d88b   888 888 88888b     d88b   888   Y888b
+  	    888     888 888  888  88b d8P  Y8b 888 888 888  88b d8P  Y8b 888      Y88b
+  	    888     888 888  888  888 88888888 888 888 888  888 88888888 888        888
+  	    888     888 888  888  888 Y8b      888 888 888  888 Y8b      88P Y88b  d88P
+  	    888     888 888  888  888   Y8888  888 888 888  888   Y8888  888   Y8888P
+  	                                                                d88P
+  	                                                              d88P
+  	                                                            888P
+  	 -->
+     <head>
+         <title>Revolutionary User Interfaces</title>
+         <meta name="description" content="The human computer interface helps to define computing at any one time.">
+         <meta charset="utf-8">
+         <meta name="apple-mobile-web-app-capable" content="yes">
+         <meta name="apple-touch-fullscreen" content="yes">
+         <!-- Style-->
+         <style>
+             html, body {
+                 height:100%;
+                 padding: 0px;
+                 margin: 0px;
+             }
+         </style>
+         <link rel="stylesheet" type="text/css" href="http://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
+         <!-- HTML5 shim, for IE6-8 support of HTML elements--><!--[if lt IE 9]>
+         <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+     </head>
+     <body>
+     <!-- BEGIN Timeline Embed -->
+     <div id="timeline-embed"></div>
+     <script type="text/javascript">
+         var timeline_config = {
+             width: "100%",
+             height: "100%",
+             source: 'timeline.php?json=yes',
+             font:	'SansitaOne-Kameron'
+         }
+     </script>
+     <script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
+     <!-- END Timeline Embed-->
+
+     </body>
+     </html>