rara-tools 0.6.12__tar.gz → 0.6.13__tar.gz

{rara_tools-0.6.12/rara_tools.egg-info → rara_tools-0.6.13}/PKG-INFO

@@ -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.13/VERSION

@@ -0,0 +1 @@
+0.6.13

{rara_tools-0.6.12 → rara_tools-0.6.13}/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 → rara_tools-0.6.13/rara_tools.egg-info}/PKG-INFO

@@ -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 → rara_tools-0.6.13}/tests/test_marc_parsers.py

@@ -6,6 +6,7 @@ from rara_tools.parsers.marc_parsers.organization_parser import OrganizationsMAR
 from rara_tools.parsers.marc_parsers.location_parser import LocationMARCParser
 from rara_tools.parsers.marc_parsers.title_parser import TitlesMARCParser
 from rara_tools.parsers.marc_records.person_record import PersonRecord
+from rara_tools.parsers.marc_records.organization_record import OrganizationRecord
 from tests.test_utils import read_json_file
 
 ROOT_DIR = os.path.join("tests", "test_data", "marc_records")
@@ -15,7 +16,8 @@ EMS_TEST_FILE = os.path.join(MARC_ROOT_DIR, "ems_test_subset.mrc")
 PER_TEST_FILE = os.path.join(MARC_ROOT_DIR, "per_test_subset.mrc")
 ORG_TEST_FILE = os.path.join(MARC_ROOT_DIR, "org_test_subset.mrc")
 TITLE_TEST_FILE = os.path.join(MARC_ROOT_DIR, "title_test_subset.mrc")
-JSON_TEST_FILE = os.path.join(JSON_ROOT_DIR, "marc_json_record.json")
+PER_JSON_TEST_FILE = os.path.join(JSON_ROOT_DIR, "per_marc_json_record.json")
+ORG_JSON_TEST_FILE = os.path.join(JSON_ROOT_DIR, "org_marc_json_record.json")
 
 def test_ems_parser_without_variations():
     ems_marc_parser = EMSMARCParser(EMS_TEST_FILE, add_variations=False)
@@ -61,7 +63,17 @@ def test_title_parser_with_variations():
         assert "link_variations" in record
         assert len(record["link_variations"]) > 0
 
-def test_creating_marc_record_with_json_input():
-    json_data = read_json_file(JSON_TEST_FILE)
+def test_creating_per_marc_record_with_json_input():
+    json_data = read_json_file(PER_JSON_TEST_FILE)
     record = PersonRecord(json_data)
     assert record.name == "Koidula, Lydia"
+
+
+def test_creating_org_marc_record_with_json_input():
+    json_data = read_json_file(ORG_JSON_TEST_FILE)
+    record = OrganizationRecord(json_data)
+    assert record.original_name.get("a") == "Eesti"
+    assert record.original_name.get("b") == "Riigikogu"
+    assert not record.location
+    assert not record.dates
+    assert not record.numeration

rara_tools-0.6.12/VERSION

@@ -1 +0,0 @@
-0.6.12