From dcde849877ba18ba664a40a6070236e5f23a6da5 Mon Sep 17 00:00:00 2001
From: gilad_ilsar <gandismidas1>
Date: Thu, 22 Sep 2016 12:48:16 +0300
Subject: update the loctaion entity

---
 .idea/workspace.xml      | 101 ++++++++++++++++++++++++-----------------------
 factories/INL_factory.py |  10 +++--
 2 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bb9e250..1bfd5ce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <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$/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" />
     </list>
     <ignored path="lib2wiki.iws" />
@@ -17,7 +16,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <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" />
+    <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" />
   </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
@@ -38,11 +37,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="INL_xml_parser.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="INL_xml_parser.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.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="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>
@@ -61,13 +60,12 @@
       <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="143">
-              <caret line="99" column="44" selection-start-line="99" selection-start-column="44" selection-end-line="99" selection-end-column="44" />
+            <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" />
               <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" />
+                <element signature="e#1190#2693#0" expanded="false" />
+                <element signature="e#2866#4151#0" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -76,8 +74,8 @@
       <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" />
+            <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>
@@ -86,18 +84,18 @@
       <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="160">
+            <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" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="factorytester.py" pinned="false" current-in-tab="true">
+      <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="187">
-              <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+            <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>
@@ -154,8 +152,8 @@
         <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" />
+        <option value="$PROJECT_DIR$/factories/INL_factory.py" />
       </list>
     </option>
   </component>
@@ -506,7 +504,14 @@
       <option name="project" value="LOCAL" />
       <updated>1474534309648</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="update the loctaion entity">
+      <created>1474534819985</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1474534819985</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -519,7 +524,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="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="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="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" />
@@ -547,11 +552,12 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="implemented the factory" />
     <MESSAGE value="tester and person entity" />
-    <option name="LAST_COMMIT_MESSAGE" value="tester and person entity" />
+    <MESSAGE value="update the loctaion entity" />
+    <option name="LAST_COMMIT_MESSAGE" value="update the loctaion entity" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="4" />
+      <option name="time" value="7" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -586,9 +592,8 @@
           <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#1143#2641#0" expanded="false" />
-            <element signature="e#1821#2024#0" expanded="false" />
-            <element signature="e#2272#2468#0" expanded="false" />
+            <element signature="e#1190#2693#0" expanded="false" />
+            <element signature="e#2866#4151#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -649,9 +654,8 @@
           <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#1143#2641#0" expanded="false" />
-            <element signature="e#1821#2024#0" expanded="false" />
-            <element signature="e#2272#2468#0" expanded="false" />
+            <element signature="e#1190#2693#0" expanded="false" />
+            <element signature="e#2866#4151#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -750,17 +754,27 @@
         </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="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$/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" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/entities/person.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
+        <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" />
           <folding />
         </state>
@@ -768,34 +782,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/factories/INL_factory.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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" />
           <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" />
+            <element signature="e#1190#2693#0" expanded="false" />
+            <element signature="e#2866#4151#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/entities/location.py">
+    <entry file="file://$PROJECT_DIR$/parsers/INL_xml_parser.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" />
+        <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$/testers/factorytester.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <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>
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/factories/INL_factory.py b/factories/INL_factory.py
index 42feea6..6b75f28 100644
--- a/factories/INL_factory.py
+++ b/factories/INL_factory.py
@@ -20,7 +20,8 @@ ENTITY_KEYS = {
     '151.9': 'name_langindic',
     '451:a': 'name_in_langs',
     '451:9': 'langs_langindic',
-    '550.a': 'type_of_place'
+    '550.a': 'type_of_place',
+    '667.a': 'comment'
 }
 
 
@@ -41,6 +42,7 @@ class INLFactory(BasicFactory):
 
     def get_entity(self,  raw_object, entity_keys=ENTITY_KEYS):
         record_key = get_record_key(raw_object)
+        #100 is person
         if record_key == '100':
             name = ''
             name_in_langs = dict()
@@ -71,12 +73,14 @@ class INLFactory(BasicFactory):
                     if field.text in name_in_langs:
                         name_in_langs.get(field.text).append(name_diff)
                     else:
-                        name_in_langs.update({field.text: [name]})
+                        name_in_langs.update({field.text: [name_diff]})
                 elif tag == 'bio_data':
                     bio_data.append(field.text)
             return entities.Person(eng_name, date_of_birth, name_in_langs, bio_data)
+        #110 is institue
         elif record_key == '110':
             return entities.Institution()
+        #151 is location
         elif record_key == '151':
             name_in_langs = dict()
             types_of_place = list()
@@ -103,7 +107,7 @@ class INLFactory(BasicFactory):
                     if field.text in name_in_langs:
                         name_in_langs.get(field.text).append(name_diff)
                     else:
-                        name_in_langs.update({field.text: [name]})
+                        name_in_langs.update({field.text: [name_diff]})
             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)))
-- 
cgit v1.2.3