fix problem with blank subjects (#2674)

wellcomecollection · Jul 1, 2024 · 21fef70 · 21fef70
1 parent 0404dc8
commit 21fef70
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/.../main/scala/weco/pipeline/transformer/marc_common/transformers/subjects/MarcSubject.scala b/.../main/scala/weco/pipeline/transformer/marc_common/transformers/subjects/MarcSubject.scala
@@ -28,12 +28,13 @@ trait MarcSubject extends MarcFieldTransformer with MarcHasRecordControlNumber {
   ): Output = getSubjectConcepts(field) match {
     case Success(Nil) => None
     case Success(entities) =>
-      Some(
-        Subject(
-          label = getLabel(field).get,
-          concepts = entities.toList,
-          id = getIdState(field)
-        )
+      getLabel(field).map(
+        label =>
+          Subject(
+            label = label,
+            concepts = entities.toList,
+            id = getIdState(field)
+          )
       )
     case Failure(exception) =>
       None

diff --git a/.../src/test/scala/weco/pipeline/transformer/marc_common/transformers/MarcSubjectsTest.scala b/.../src/test/scala/weco/pipeline/transformer/marc_common/transformers/MarcSubjectsTest.scala
@@ -38,17 +38,28 @@ class MarcSubjectsTest
       MarcSubjects(
         MarcTestRecord(fields =
           Seq(
+            // with no subfields
             MarcField(
               marcTag = "610",
               subfields = Nil
             ),
+            // with blank or blank-like subfields
             MarcField(
-              marcTag = "600",
+              marcTag = "650",
+              indicator2 = "0",
               subfields = Seq(
                 MarcSubfield(tag = "a", content = "   "),
                 MarcSubfield(tag = "b", content = ""),
                 MarcSubfield(tag = "c", content = "  ")
               )
+            ),
+            // with a dodgy second indicator
+            MarcField(
+              marcTag = "650",
+              indicator2 = "x",
+              subfields = Seq(
+                MarcSubfield(tag = "a", content = "Hello, World!")
+              )
             )
           )
         )