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

rara_tools/parsers/marc_records/base_record.py

@@ -1,13 +1,14 @@
 from typing import List, NoReturn, Tuple
 from abc import abstractmethod
 from pymarc.record import Record
+from pymarc.marcjson import JSONHandler
 from rara_tools.constants.parsers import GeneralMarcIDs
 
 
 class BaseRecord:
     """ Implements general logic of parsing MARC files.
     """
-    def __init__(self, record: Record, add_variations: bool = False) -> NoReturn:
+    def __init__(self, record: Record | dict, add_variations: bool = False) -> NoReturn:
         """ Initializes BaseRecord object.
 
         Parameters
@@ -21,8 +22,8 @@ class BaseRecord:
             via rara-norm-linker, it is necessary to enable this.
         """
         self.add_variations: bool = add_variations
-        self.__record_mrc: Record = record
-        self.__record_dict: dict = record.as_dict()["fields"]
+        self.__record_marc: Record = self._get_record_marc(record)
+        self.__record_dict: dict = self.marc_record.as_dict()["fields"]
 
         self.__id_field_id: List[str] = GeneralMarcIDs.ID
         self.__id_source_field_id: List[str] = GeneralMarcIDs.ID_SOURCE
@@ -30,6 +31,13 @@ class BaseRecord:
         self.__identifier: str = ""
         self.__identifier_source: str = ""
 
+    def _get_record_marc(self, record: Record | dict) -> Record:
+        """ Converts dict-type records into pymarc.Record objects.
+        """
+        if isinstance(record, dict):
+            record = JSONHandler().elements([record])[0]
+        return record
+
     def get_values(self,
             marc_ids: List[str],
             subfield_id: str | List[str] = "",
@@ -101,7 +109,7 @@ class BaseRecord:
 
     @property
     def marc_record(self) -> Record:
-        return self.__record_mrc
+        return self.__record_marc
 
     @property
     def marc_json_record(self) -> dict:

rara_tools/parsers/marc_records/organization_record.py

@@ -1,7 +1,7 @@
 from typing import List, NoReturn
 from pymarc.record import Record
 from rara_tools.parsers.marc_records.base_record import BaseRecord
-from rara_tools.constants.parsers import OrganizationMarcIDs
+from rara_tools.constants.parsers import OrganizationMarcIDs, LOGGER
 import regex as re
 import json
 
@@ -38,9 +38,9 @@ class OrganizationRecord(BaseRecord):
         self.__name: str = ""
         self.__original_name: dict = {}
         self.__name_specification: str = ""
-        self.__life_years: str = ""
-        self.__birth_year: int = -1
-        self.__death_year: int = -1
+        self.__dates: str = ""
+        self.__location: str = ""
+        self.__numeration: str = ""
         self.__name_variations: List[str] = []
         self.__source: str = ""
         self.__description: str = ""
@@ -57,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:
@@ -82,7 +85,10 @@ class OrganizationRecord(BaseRecord):
                     "b": self._clean_value(values[0].get("b", ""))
                 }
             else:
-                print(self.marc_record)
+                LOGGER.info(
+                    f"Could not parse subfields 'a' and/or 'b' from " \
+                    f"field {self.__name_field_id}. Record:\n{self.marc_record}"
+                )
         return self.__original_name
 
     @property
@@ -91,6 +97,39 @@ class OrganizationRecord(BaseRecord):
             self.__name = self._merge_and_clean(self.original_name, ["a", "b"])
         return self.__name
 
+    @property
+    def dates(self) -> str:
+        if not self.__dates:
+            values = self.get_values(
+                marc_ids=self.__name_field_id,
+                subfield_id="d"
+            )
+            if values:
+                self.__dates = self._clean_value(values[0])
+        return self.__dates
+
+    @property
+    def location(self) -> str:
+        if not self.__location:
+            values = self.get_values(
+                marc_ids=self.__name_field_id,
+                subfield_id="c"
+            )
+            if values:
+                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.11.dist-info → rara_tools-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rara-tools
-Version: 0.6.11
+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.11.dist-info → rara_tools-0.6.13.dist-info}/RECORD

@@ -26,16 +26,16 @@ rara_tools/parsers/marc_parsers/location_parser.py,sha256=dSU9dQoGV5z0ajhLI1bn3A
 rara_tools/parsers/marc_parsers/organization_parser.py,sha256=faqQEYsut_ZF3kX1QycTnbRIqC7W8sULxmG75ICfya8,1629
 rara_tools/parsers/marc_parsers/person_parser.py,sha256=iMycHSlgfvgB0axE_rneB5sImVlc920FcBnTsUsmVW4,1582
 rara_tools/parsers/marc_parsers/title_parser.py,sha256=uZiYb_aZWzv_xLEBSZmFt2vN6UIauNSFRCkNG_ZKL10,1570
-rara_tools/parsers/marc_records/base_record.py,sha256=05XW1oQ5fCJWxBpmBFwGVGLChGE0P605HNUdvXGiif8,4330
+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=HmDqAqAL_Tw7ppEsS5HfogrfNuQMNChCkrdPu6K-SUE,9141
+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.11.dist-info/licenses/LICENSE.md,sha256=hkZVnIZll7e_KNEQzeY94Y9tlzVL8iVZBTMBvDykksU,35142
-rara_tools-0.6.11.dist-info/METADATA,sha256=QzQV8b9zxNtmjVx2i2w2j96NDzPSLzA0XrOZIYrwQIw,4080
-rara_tools-0.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rara_tools-0.6.11.dist-info/top_level.txt,sha256=JwfB5b8BAtW5OFKRln2AQ_WElTRyIBM4nO0FKN1cupY,11
-rara_tools-0.6.11.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,,