moar neo4j fixes
--- 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,8 @@
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="neo4jimporter.iws" />
<ignored path=".idea/workspace.xml" />
@@ -73,7 +69,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 +79,10 @@
<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.096345514" vertical-offset="5603" max-vertical-offset="6766">
+ <caret line="333" column="77" selection-start-line="333" selection-start-column="66" selection-end-line="333" selection-end-column="66" />
<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" />
</folding>
</state>
</provider>
@@ -138,10 +114,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 +146,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
@@ -230,7 +208,6 @@
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -252,6 +229,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 +266,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 +278,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 +309,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 +327,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 +405,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="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="false" weight="0.32992327" 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="true" 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 +450,69 @@
<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" />
+ </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" />
+ </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" />
+ </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">
@@ -451,30 +555,10 @@
</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.096345514" vertical-offset="5603" max-vertical-offset="6766">
+ <caret line="333" column="77" selection-start-line="333" selection-start-column="66" selection-end-line="333" selection-end-column="66" />
<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" />
</folding>
</state>
</provider>
@@ -531,7 +615,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,13 @@
//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, "TITLE")) {
- System.out.println("TITLE is: " + getCharacters(r));
- previousAgency.put("title", getCharacters(r));
- } 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>();
} else if (hasStartTagName(e, "AGENCY_LINK")) {
processAgencyLink(r);
} else if (hasStartTagName(e, "AGENCY_LOCATION")) {
@@ -100,6 +92,23 @@
processAgencyFunction(r);
} else if (hasStartTagName(e, "AGENCY_STATUS")) {
processAgencyStatus(r);
+ } else if (hasStartTagName(e, "AGENCY_NO")) {
+ previousAgency.put("agency_no", getCharacters(r));
+ } else if (hasStartTagName(e, "TITLE")) {
+ previousAgency.put("name", getCharacters(r));
+ } else if (hasStartTagName(e, "START_DATE")) {
+ previousAgency.put("start_date", getCharacters(r));
+ } 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")) {
+ previousAgency.put("end_date", getCharacters(r));
+ } else if (hasStartTagName(e, "END_DATE_QUAL")) {
+ previousAgency.put("end_date_qual", getCharacters(r));
+ // save agency
+ getAgency(previousAgency);
+ previousAgency = new HashMap<String, Object>();
} else {
System.out.println("Unhandled tag: " + getStartTagName(e) + " content:" + getCharacters(r));
}
@@ -144,7 +153,7 @@
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);
long locationID = inserter.createNode(properties, locationLabel);
locationIDs.put(locationName, locationID);
return locationID;
@@ -155,7 +164,7 @@
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);
long functionID = inserter.createNode(properties, functionLabel);
functionIDs.put(functionName, functionID);
return functionID;
@@ -166,7 +175,7 @@
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);
long statusID = inserter.createNode(properties, statusLabel);
statusIDs.put(statusName, statusID);
return statusID;
@@ -217,9 +226,15 @@
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);
+ 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", 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);
@@ -333,10 +348,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", 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", 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);
@@ -356,7 +377,7 @@
}
private boolean hasStartTagName(XMLEvent e, String name) {
- return e.asStartElement().getName().getLocalPart().equals(name);
+ return e.asStartElement().getName().getLocalPart().toLowerCase().equals(name.toLowerCase());
}
private String getStartTagName(XMLEvent e) {
@@ -364,7 +385,7 @@
}
private boolean hasEndTagName(XMLEvent e, String name) {
-