update the loctaion entity

3 files changed, 97 insertions, 72 deletions

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69eda32..bb9e250 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1d9b5e9b-4282-4345-b663-d1b92a287a32" name="Default" comment="tester and person entity">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/parser.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testers/factorytester.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+    <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$/entities/person.py" afterPath="$PROJECT_DIR$/entities/person.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/entities/location.py" afterPath="$PROJECT_DIR$/entities/location.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/factories/INL_factory.py" afterPath="$PROJECT_DIR$/factories/INL_factory.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/parsers/INL_xml_parser.py" afterPath="$PROJECT_DIR$/parsers/INL_xml_parser.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/parsers/__init__.py" afterPath="$PROJECT_DIR$/parsers/__init__.py" />
     </list>
     <ignored path="lib2wiki.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -23,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="1474534270581" 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="1474534796745" 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="" />
@@ -67,22 +61,33 @@
       <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="629">
-              <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
+            <state relative-caret-position="143">
+              <caret line="99" column="44" selection-start-line="99" selection-start-column="44" selection-end-line="99" selection-end-column="44" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
-                <element signature="e#1812#2015#0" expanded="false" />
-                <element signature="e#2263#2459#0" expanded="false" />
+                <element signature="e#1143#2641#0" expanded="false" />
+                <element signature="e#1821#2024#0" expanded="false" />
+                <element signature="e#2272#2468#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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <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="680">
-              <caret line="40" column="20" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="20" />
+            <state relative-caret-position="160">
+              <caret line="40" column="27" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="27" />
               <folding />
             </state>
           </provider>
@@ -91,8 +96,8 @@
       <file leaf-file-name="factorytester.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/testers/factorytester.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
+            <state relative-caret-position="187">
+              <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
               <folding>
                 <element signature="e#0#38#0" expanded="true" />
               </folding>
@@ -100,16 +105,6 @@
           </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="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/entities/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -154,13 +149,13 @@
         <option value="$PROJECT_DIR$/entities/__init__.py" />
         <option value="$PROJECT_DIR$/factories/__init__.py" />
         <option value="$PROJECT_DIR$/libs/__init__.py" />
-        <option value="$PROJECT_DIR$/entities/location.py" />
         <option value="$PROJECT_DIR$/entities/testers/factorytester.py" />
         <option value="$PROJECT_DIR$/parsers/__init__.py" />
-        <option value="$PROJECT_DIR$/factories/INL_factory.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$/factories/INL_factory.py" />
+        <option value="$PROJECT_DIR$/entities/location.py" />
       </list>
     </option>
   </component>
@@ -219,6 +214,20 @@
               <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>
+          </PATH>
         </subPane>
       </pane>
       <pane id="Scratches" />
@@ -490,7 +499,14 @@
       <option name="project" value="LOCAL" />
       <updated>1474498941858</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="tester and person entity">
+      <created>1474534309648</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1474534309648</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -503,7 +519,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="true" 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="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" />
@@ -530,7 +546,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="implemented the factory" />
-    <option name="LAST_COMMIT_MESSAGE" value="implemented the factory" />
+    <MESSAGE value="tester and person entity" />
+    <option name="LAST_COMMIT_MESSAGE" value="tester and person entity" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -569,8 +586,9 @@
           <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#1812#2015#0" expanded="false" />
-            <element signature="e#2263#2459#0" expanded="false" />
+            <element signature="e#1143#2641#0" expanded="false" />
+            <element signature="e#1821#2024#0" expanded="false" />
+            <element signature="e#2272#2468#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -631,8 +649,9 @@
           <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#1812#2015#0" expanded="false" />
-            <element signature="e#2263#2459#0" expanded="false" />
+            <element signature="e#1143#2641#0" expanded="false" />
+            <element signature="e#1821#2024#0" expanded="false" />
+            <element signature="e#2272#2468#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -707,70 +726,71 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/entities/location.py">
+    <entry file="file://$PROJECT_DIR$/parsers/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/entities/person.py">
+    <entry file="file://$PROJECT_DIR$/factories/basic_factory.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="680">
-          <caret line="40" column="20" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="20" />
+        <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$/factories/basic_factory.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="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$/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="153">
+          <caret line="23" column="46" selection-start-line="23" selection-start-column="46" selection-end-line="23" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/factories/INL_factory.py">
+    <entry file="file://$PROJECT_DIR$/entities/person.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
-          <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#1812#2015#0" expanded="false" />
-            <element signature="e#2263#2459#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="160">
+          <caret line="40" column="27" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/factories/basic_factory.py">
+    <entry file="file://$PROJECT_DIR$/factories/INL_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 relative-caret-position="143">
+          <caret line="99" column="44" selection-start-line="99" selection-start-column="44" selection-end-line="99" selection-end-column="44" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#1143#2641#0" expanded="false" />
+            <element signature="e#1821#2024#0" expanded="false" />
+            <element signature="e#2272#2468#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.py">
+    <entry file="file://$PROJECT_DIR$/entities/location.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="23" column="46" selection-start-line="23" selection-start-column="46" selection-end-line="23" selection-end-column="46" />
+        <state relative-caret-position="51">
+          <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/testers/factorytester.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
+        <state relative-caret-position="187">
+          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
           <folding>
             <element signature="e#0#38#0" expanded="true" />
           </folding>
diff --git a/entities/location.py b/entities/location.py
index 9636c3b..cd1ca01 100644
--- a/entities/location.py
+++ b/entities/location.py
@@ -2,7 +2,12 @@ from entities.basic_entity import BasicEntity
 
 
 class Location(BasicEntity):
-    def __init__(self, name, types, name_in_langs):
+    def __init__(self, name, types_of_place, name_in_langs):
         self.name = name
-        self.types = types
+        self.types_of_place = types_of_place
         self.name_in_langs = name_in_langs
+
+    def print_entity(self):
+        print("Name = " + self.name)
+        print("Name in langs = " + str(self.name_in_langs))
+        print("Types = " + str(self.types_of_place))
diff --git a/factories/INL_factory.py b/factories/INL_factory.py
index adc5b1a..42feea6 100644
--- a/factories/INL_factory.py
+++ b/factories/INL_factory.py
@@ -20,7 +20,7 @@ ENTITY_KEYS = {
     '151.9': 'name_langindic',
     '451:a': 'name_in_langs',
     '451:9': 'langs_langindic',
-    '550.a': 'type'
+    '550.a': 'type_of_place'
 }
 
 
@@ -79,7 +79,7 @@ class INLFactory(BasicFactory):
             return entities.Institution()
         elif record_key == '151':
             name_in_langs = dict()
-            types = []
+            types_of_place = list()
             for field in raw_object.getroot():
                 key = field.attrib.get('tag')
                 tag = entity_keys.get(key)
@@ -95,8 +95,8 @@ class INLFactory(BasicFactory):
                             name_in_langs.get(field.text).append(name)
                         else:
                             name_in_langs.update({field.text: [name]})
-                elif tag == 'type':
-                    types.append(field.text)
+                elif tag == 'type_of_place':
+                    types_of_place.append(field.text)
                 elif tag == 'name_in_langs':
                     name_diff = field.text
                 elif tag == 'langs_langindic':
@@ -104,7 +104,7 @@ class INLFactory(BasicFactory):
                         name_in_langs.get(field.text).append(name_diff)
                     else:
                         name_in_langs.update({field.text: [name]})
-            return entities.Location(eng_name, types, name_in_langs)
+            return entities.Location(eng_name, types_of_place , name_in_langs)
         else:
             raise KeyError('Key {} was not recognized for factory {}'.format(entity_keys, type(self)))