diff options
author | gilad_ilsar <gandismidas1> | 2016-09-22 13:22:52 +0300 |
---|---|---|
committer | gilad_ilsar <gandismidas1> | 2016-09-22 13:22:52 +0300 |
commit | cc9c0e57d5a23be30a9d0ad5a97acaa01019b573 (patch) | |
tree | 0c03b156d15a95c55106e42abc62a7a277c3e345 | |
parent | dd05b848f927ceccd80f00fab7e54778226d35d2 (diff) |
update the loctaion entity
-rw-r--r-- | .idea/workspace.xml | 182 | ||||
-rw-r--r-- | readers/xml_reader.py | 4 | ||||
-rw-r--r-- | testers/factorytester.py | 2 |
3 files changed, 115 insertions, 73 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 080c4b2..292b4fc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,8 @@ <component name="ChangeListManager"> <list default="true" id="1d9b5e9b-4282-4345-b663-d1b92a287a32" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/readers/xml_reader.py" afterPath="$PROJECT_DIR$/readers/xml_reader.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testers/factorytester.py" afterPath="$PROJECT_DIR$/testers/factorytester.py" /> </list> <ignored path="lib2wiki.iws" /> <ignored path=".idea/workspace.xml" /> @@ -15,7 +17,7 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="CoverageDataManager"> - <SUITE FILE_PATH="coverage/parser$factorytester.coverage" NAME="factorytester Coverage Results" MODIFIED="1474537524074" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testers" /> + <SUITE FILE_PATH="coverage/parser$factorytester.coverage" NAME="factorytester Coverage Results" MODIFIED="1474538841285" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testers" /> </component> <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> @@ -26,17 +28,7 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="basic_factory.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/factories/basic_factory.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="17"> - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="INL_xml_parser.py" pinned="false" current-in-tab="true"> + <file leaf-file-name="INL_xml_parser.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="340"> @@ -49,8 +41,8 @@ <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/parsers/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="17"> + <caret line="1" column="40" selection-start-line="1" selection-start-column="40" selection-end-line="1" selection-end-column="40" /> <folding /> </state> </provider> @@ -59,22 +51,22 @@ <file leaf-file-name="INL_factory.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/factories/INL_factory.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-112"> - <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" /> + <state relative-caret-position="313"> + <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="47" /> <folding> <element signature="e#0#15#0" expanded="true" /> - <element signature="e#1190#2693#0" expanded="false" /> + <element signature="e#1654#2071#0" expanded="false" /> <element signature="e#2866#4151#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="location.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/entities/location.py"> + <file leaf-file-name="xml_reader.py" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/readers/xml_reader.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" /> + <state relative-caret-position="301"> + <caret line="20" column="34" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" /> <folding /> </state> </provider> @@ -83,8 +75,28 @@ <file leaf-file-name="person.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/entities/person.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="670"> - <caret line="40" column="27" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="27" /> + <state relative-caret-position="17"> + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="basic_entity.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/entities/basic_entity.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="51"> + <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="location.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/entities/location.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" /> <folding /> </state> </provider> @@ -93,8 +105,8 @@ <file leaf-file-name="factorytester.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/testers/factorytester.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="296"> - <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> + <state relative-caret-position="323"> + <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" /> <folding> <element signature="e#0#38#0" expanded="true" /> </folding> @@ -116,7 +128,7 @@ <entry file="file://$PROJECT_DIR$/libs/json_tools.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="51"> - <caret line="3" column="22" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="22" /> + <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> <folding /> </state> </provider> @@ -149,10 +161,11 @@ <option value="$PROJECT_DIR$/entities/testers/factorytester.py" /> <option value="$PROJECT_DIR$/parsers/__init__.py" /> <option value="$PROJECT_DIR$/entities/person.py" /> - <option value="$PROJECT_DIR$/testers/factorytester.py" /> <option value="$PROJECT_DIR$/parsers/INL_xml_parser.py" /> <option value="$PROJECT_DIR$/entities/location.py" /> <option value="$PROJECT_DIR$/factories/INL_factory.py" /> + <option value="$PROJECT_DIR$/testers/factorytester.py" /> + <option value="$PROJECT_DIR$/readers/xml_reader.py" /> </list> </option> </component> @@ -221,6 +234,20 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="readers" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="parser" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parser" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="entities" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -517,7 +544,14 @@ <option name="project" value="LOCAL" /> <updated>1474537696879</updated> </task> - <option name="localTasksCounter" value="6" /> + <task id="LOCAL-00006" summary="update the loctaion entity"> + <created>1474537703873</created> + <option name="number" value="00006" /> + <option name="presentableId" value="LOCAL-00006" /> + <option name="project" value="LOCAL" /> + <updated>1474537703873</updated> + </task> + <option name="localTasksCounter" value="7" /> <servers /> </component> <component name="ToolWindowManager"> @@ -530,7 +564,7 @@ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32913387" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32913387" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> @@ -598,7 +632,7 @@ <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" /> <folding> <element signature="e#0#15#0" expanded="true" /> - <element signature="e#1190#2693#0" expanded="false" /> + <element signature="e#1654#2071#0" expanded="false" /> <element signature="e#2866#4151#0" expanded="false" /> </folding> </state> @@ -660,7 +694,7 @@ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> <element signature="e#0#15#0" expanded="true" /> - <element signature="e#1190#2693#0" expanded="false" /> + <element signature="e#1654#2071#0" expanded="false" /> <element signature="e#2866#4151#0" expanded="false" /> </folding> </state> @@ -674,14 +708,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/entities/basic_entity.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="85"> - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/entities/institution.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="85"> @@ -720,88 +746,104 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/entities/__init__.py"> + <entry file="file://$PROJECT_DIR$/factories/basic_factory.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="34"> - <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" /> + <state relative-caret-position="17"> + <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/libs/json_tools.py"> + <entry file="file://$PROJECT_DIR$/factories/basic_factory.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="22" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="22" /> + <state relative-caret-position="17"> + <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/parsers/__init__.py"> + <entry file="file://$PROJECT_DIR$/entities/location.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="68"> + <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/factories/basic_factory.py"> + <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="17"> - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> + <state relative-caret-position="340"> + <caret line="20" column="46" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/factories/basic_factory.py"> + <entry file="file://$PROJECT_DIR$/parsers/__init__.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> + <caret line="1" column="40" selection-start-line="1" selection-start-column="40" selection-end-line="1" selection-end-column="40" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/entities/location.py"> + <entry file="file://$PROJECT_DIR$/entities/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" /> + <state relative-caret-position="34"> + <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testers/factorytester.py"> + <entry file="file://$PROJECT_DIR$/libs/json_tools.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="296"> - <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> - <folding> - <element signature="e#0#38#0" expanded="true" /> - </folding> + <state relative-caret-position="51"> + <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/entities/basic_entity.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="51"> + <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/entities/person.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="670"> - <caret line="40" column="27" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="27" /> + <state relative-caret-position="17"> + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/factories/INL_factory.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-112"> - <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" /> + <state relative-caret-position="313"> + <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="47" /> <folding> <element signature="e#0#15#0" expanded="true" /> - <element signature="e#1190#2693#0" expanded="false" /> + <element signature="e#1654#2071#0" expanded="false" /> <element signature="e#2866#4151#0" expanded="false" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.py"> + <entry file="file://$PROJECT_DIR$/testers/factorytester.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="340"> - <caret line="20" column="46" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" /> + <state relative-caret-position="323"> + <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" /> + <folding> + <element signature="e#0#38#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/readers/xml_reader.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="301"> + <caret line="20" column="34" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" /> <folding /> </state> </provider> diff --git a/readers/xml_reader.py b/readers/xml_reader.py index 55a0750..bd7821b 100644 --- a/readers/xml_reader.py +++ b/readers/xml_reader.py @@ -16,7 +16,7 @@ def read_file(path, element_key): context = iter(context) # get the root element - event, root = context.next() + event, root = context.__next__() for event, element in context: if 'end' in event: @@ -24,7 +24,7 @@ def read_file(path, element_key): record_counter += 1 cleaned_element = parsers.INLXmlParser(element).clearxml() # import pdb; pdb.set_trace() - print record_counter, cleaned_element.getroot().tag, '@@@', cleaned_element.getroot().attrib, '@@@', cleaned_element.getroot().text + print(record_counter, cleaned_element.getroot().tag, '@@@', cleaned_element.getroot().attrib, '@@@', cleaned_element.getroot().text) element.clear() diff --git a/testers/factorytester.py b/testers/factorytester.py index cc95bab..121e068 100644 --- a/testers/factorytester.py +++ b/testers/factorytester.py @@ -17,5 +17,5 @@ for record in xmltree.getroot(): entities.append(inl_factory.get_entity(clean_record)) for entity in entities: - entity.print_entity() + print(entity) |