TIMX 501 - update aspace oai identifier parsing

tests/fixtures/ead/ead_record_all_fields.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata>

tests/fixtures/ead/ead_record_attribute_and_subfield_variations.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/6</identifier>
+            <identifier>oai:mit/repositories/2/resources/6</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata>

tests/fixtures/ead/ead_record_blank_optional_fields.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/2</identifier>
+            <identifier>oai:mit/repositories/2/resources/2</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata>

tests/fixtures/ead/ead_record_missing_archdesc.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/4</identifier>
+            <identifier>oai:mit/repositories/2/resources/4</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata></metadata>

tests/fixtures/ead/ead_record_missing_archdesc_did.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/3</identifier>
+            <identifier>oai:mit/repositories/2/resources/3</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata>

tests/fixtures/ead/ead_record_missing_optional_fields.xml

@@ -2,7 +2,7 @@
 <records>
     <record xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <header>
-            <identifier>oai:mit//repositories/2/resources/5</identifier>
+            <identifier>oai:mit/repositories/2/resources/5</identifier>
             <datestamp>2021-11-06T14:35:55Z</datestamp>
         </header>
         <metadata>

tests/sources/xml/test_ead.py

@@ -880,7 +880,7 @@ def test_get_dates_success():
     source_record = create_ead_source_record_stub(
         header_insert=(
             """
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             """
         ),
         metadata_insert=(
@@ -907,7 +907,7 @@ def test_get_dates_transforms_correctly_if_fields_blank():
     source_record = create_ead_source_record_stub(
         header_insert=(
             """
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             """
         ),
         metadata_insert=(
@@ -924,7 +924,7 @@ def test_get_dates_transforms_correctly_if_fields_missing():
     source_record = create_ead_source_record_stub(
         header_insert=(
             """
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             """
         ),
         parent_element="did",
@@ -936,7 +936,7 @@ def test_get_dates_transforms_correctly_if_date_invalid():
     source_record = create_ead_source_record_stub(
         header_insert=(
             """
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             """
         ),
         metadata_insert=(
@@ -955,7 +955,7 @@ def test_get_dates_transforms_correctly_if_normal_attribute_missing():
     source_record = create_ead_source_record_stub(
         header_insert=(
             """
-            <identifier>oai:mit//repositories/2/resources/1</identifier>
+            <identifier>oai:mit/repositories/2/resources/1</identifier>
             """
         ),
         metadata_insert=(

transmogrifier/sources/transformer.py

@@ -107,10 +107,10 @@ def __next__(self) -> DatasetRecord:
                 self.skipped_record_count += 1
                 action = "skip"
 
-            except Exception as exception:  # noqa: BLE001
+            except Exception as exception:
                 self.error_record_count += 1
                 message = f"Unhandled exception during record transformation: {exception}"
-                logger.warning(message)
+                logger.exception(message)
                 action = "error"
 
             return DatasetRecord(

transmogrifier/sources/xml/ead.py

@@ -1,4 +1,5 @@
 import logging
+import re
 from collections.abc import Generator
 
 from bs4 import NavigableString, Tag  # type: ignore[import-untyped]
@@ -549,7 +550,14 @@ def get_source_record_id(cls, source_record: Tag) -> str:
         Args:
             source_record: A BeautifulSoup Tag representing a single EAD XML record.
         """
-        return source_record.header.identifier.string.split("//")[1]
+        matches = re.match(r"oai:mit/+(.*)", source_record.header.identifier.string)
+        if not matches:
+            message = (
+                "Could not parse TIMDEX identifier from OAI identifier: "
+                f"'{source_record.header.identifier.string}'"
+            )
+            raise ValueError(message)
+        return matches.groups()[0]
 
     @classmethod
     def parse_mixed_value(