rara-tools 0.6.12__py3-none-any.whl → 0.6.13__py3-none-any.whl

rara_tools/parsers/marc_records/organization_record.py

@@ -6,13 +6,8 @@ import regex as re
 import json
 
 # TODO: indikaatorid ind1 väljadel 100 ja 400?
-"""
-|c asutuse konverentsi toimumise koht (MK)
 
-|d asutuse konverentsi toimumise aeg (K)
 
-|n asutuse konverentsi järjenumber (K)
-"""
 class OrganizationRecord(BaseRecord):
     """ Generates a simplified organization JSON record
     from a pymarc MARC record.
@@ -45,6 +40,7 @@ class OrganizationRecord(BaseRecord):
         self.__name_specification: str = ""
         self.__dates: str = ""
         self.__location: str = ""
+        self.__numeration: str = ""
         self.__name_variations: List[str] = []
         self.__source: str = ""
         self.__description: str = ""
@@ -61,7 +57,10 @@ class OrganizationRecord(BaseRecord):
 
 
     def _clean_value(self, value: str) -> str:
-        cleaned_value = value.strip("., ")
+        try:
+            cleaned_value = value.strip("., ")
+        except Exception as e:
+            cleaned_value = ""
         return cleaned_value
 
     def _merge_and_clean(self, value: dict, keys: List[str]) -> str:
@@ -103,10 +102,10 @@ class OrganizationRecord(BaseRecord):
         if not self.__dates:
             values = self.get_values(
                 marc_ids=self.__name_field_id,
-                subfield_id=["d"]
+                subfield_id="d"
             )
             if values:
-                self.__dates = self.__clean_value(values[0])
+                self.__dates = self._clean_value(values[0])
         return self.__dates
 
     @property
@@ -114,12 +113,23 @@ class OrganizationRecord(BaseRecord):
         if not self.__location:
             values = self.get_values(
                 marc_ids=self.__name_field_id,
-                subfield_id=["c"]
+                subfield_id="c"
             )
             if values:
-                self.__location = self.__clean_value(values[0])
+                self.__location = self._clean_value(values[0])
         return self.__location
 
+    @property
+    def numeration(self) -> str:
+        if not self.__numeration:
+            values = self.get_values(
+                marc_ids=self.__name_field_id,
+                subfield_id="n"
+            )
+            if values:
+                self.__numeration = self._clean_value(values[0])
+        return self.__numeration
+
     @property
     def acronyms(self) -> List[str]:
         if not self.__acronyms:

{rara_tools-0.6.12.dist-info → rara_tools-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rara-tools
-Version: 0.6.12
+Version: 0.6.13
 Summary: Tools to support Kata's work.
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{rara_tools-0.6.12.dist-info → rara_tools-0.6.13.dist-info}/RECORD

@@ -28,14 +28,14 @@ rara_tools/parsers/marc_parsers/person_parser.py,sha256=iMycHSlgfvgB0axE_rneB5sI
 rara_tools/parsers/marc_parsers/title_parser.py,sha256=uZiYb_aZWzv_xLEBSZmFt2vN6UIauNSFRCkNG_ZKL10,1570
 rara_tools/parsers/marc_records/base_record.py,sha256=yllX2ArjBm9PfUnH6dk3__Rb2LQuEGCYqZGVKBzqSl0,4673
 rara_tools/parsers/marc_records/ems_record.py,sha256=B2YZLEeDd-GmmYqxhczbMsSEB7-x6ZLjB8OeDnzOxww,9376
-rara_tools/parsers/marc_records/organization_record.py,sha256=i1bYVxHkC7Gc7tG7on4LJ83skI0gLiKsU1QD9gSi8Mo,10044
+rara_tools/parsers/marc_records/organization_record.py,sha256=WFmmMBiZUhaIMh-j06ChH37JLT7yFG7ZDc_0keqjIYo,10355
 rara_tools/parsers/marc_records/person_record.py,sha256=AtGESwFmN5YvrBES0BsfTgOZbroB4l0SuFRznumfmJA,7867
 rara_tools/parsers/marc_records/title_record.py,sha256=XrtJ4gj7wzSaGxNaPtPuawmqqkXsVX5HAAKfXTSo4mA,6855
 rara_tools/parsers/tools/entity_normalizers.py,sha256=VyCy_NowCLpOsL0luQ55IW-Qi-J5oBH0Ofzr7HRFBhM,8949
 rara_tools/parsers/tools/marc_converter.py,sha256=LgSHe-7n7aiDrw2bnsB53r3fXTRFjZXTwBYfTpL0pfs,415
 rara_tools/parsers/tools/russian_transliterator.py,sha256=5ZU66iTqAhr7pmfVqXPAI_cidF43VqqmuN4d7H4_JuA,9770
-rara_tools-0.6.12.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
-rara_tools-0.6.12.dist-info/METADATA,sha256=N-5ZB05VDM0rjb6pxV88lD7jIdwYl1FxRf84E05-Wr0,4080
-rara_tools-0.6.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rara_tools-0.6.12.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
-rara_tools-0.6.12.dist-info/RECORD,,
+rara_tools-0.6.13.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
+rara_tools-0.6.13.dist-info/METADATA,sha256=P_y0fL650yYO1aN0Db2d_2pq93g99ytU8_pNq6kl0iY,4080
+rara_tools-0.6.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rara_tools-0.6.13.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
+rara_tools-0.6.13.dist-info/RECORD,,