connect the iiif presentation file, rather than the collection (#2637)

* add ebsco reindexer topic * new pipeline * connect the iiif presentation file, rather than the collection * remove redundant test
wellcomecollection · May 10, 2024 · 710cdfd · 710cdfd
1 parent b02a321
commit 710cdfd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/...transformer_mets/src/main/scala/weco/pipeline/transformer/mets/transformer/MetsData.scala b/...transformer_mets/src/main/scala/weco/pipeline/transformer/mets/transformer/MetsData.scala
@@ -139,8 +139,8 @@ object InvisibleMetsData {
     modifiedTime: Instant
   ): Result[InvisibleMetsData] = {
     val locationPrefix = filesRoot match {
-      case _: GoobiMetsXml         => "v2"
-      case _: ArchivematicaMetsXML => "collections/archives"
+      case _: GoobiMetsXml         => "v2/"
+      case _: ArchivematicaMetsXML => ""
     }
     for {
       recordIdentifier <- root.recordIdentifier

diff --git a/...former_mets/src/main/scala/weco/pipeline/transformer/mets/transformers/MetsLocation.scala b/...former_mets/src/main/scala/weco/pipeline/transformer/mets/transformers/MetsLocation.scala
@@ -19,7 +19,7 @@ object MetsLocation {
   ): DigitalLocation =
     DigitalLocation(
       url =
-        s"https://iiif.wellcomecollection.org/presentation/$locationPrefix/$recordIdentifier",
+        s"https://iiif.wellcomecollection.org/presentation/$locationPrefix$recordIdentifier",
       locationType = LocationType.IIIFPresentationAPI,
       license = license,
       accessConditions = accessConditions(accessStatus, accessConditionUsage)

diff --git a/...er_mets/src/test/scala/weco/pipeline/transformer/mets/generators/MetsDataGenerators.scala b/...er_mets/src/test/scala/weco/pipeline/transformer/mets/generators/MetsDataGenerators.scala
@@ -33,6 +33,6 @@ trait MetsDataGenerators extends SierraIdentifierGenerators {
       thumbnailReference = thumbnailReference,
       version = version,
       modifiedTime = modifiedTime,
-      locationPrefix = "v2"
+      locationPrefix = "v2/"
     )
 }
diff --git a/.../src/test/scala/weco/pipeline/transformer/mets/transformer/ArchivematicaMetsXMLTest.scala b/.../src/test/scala/weco/pipeline/transformer/mets/transformer/ArchivematicaMetsXMLTest.scala
@@ -3,11 +3,17 @@ package weco.pipeline.transformer.mets.transformer
 import org.scalatest.EitherValues
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers
-import weco.catalogue.internal_model.locations.{AccessStatus, License}
+import weco.catalogue.internal_model.locations.{
+  AccessStatus,
+  DigitalLocation,
+  License
+}
 import weco.fixtures.LocalResources
 import weco.pipeline.transformer.mets.generators.ArchivematicaMetsGenerators
 import weco.pipeline.transformer.mets.transformers.MetsAccessConditions
 
+import java.time.Instant
+
 class ArchivematicaMetsXMLTest
     extends AnyFunSpec
     with Matchers
@@ -35,6 +41,21 @@ class ArchivematicaMetsXMLTest
           "BA/AD/FO/OD"
       }
 
+      it("uses the recordIdentifier to determine the location") {
+        val xml = ArchivematicaMetsXML(
+          archivematicaMetsWith(recordIdentifier = "BA/AD/FO/OD")
+        )
+        val metsWork = InvisibleMetsData(
+          root = xml,
+          filesRoot = xml,
+          version = 1,
+          modifiedTime = Instant.now()
+        ).right.get.toWork
+        metsWork.data.items.head.locations.head
+          .asInstanceOf[DigitalLocation]
+          .url shouldBe "https://iiif.wellcomecollection.org/presentation/BA/AD/FO/OD"
+      }
+
     }
 
     describe("failure conditions") {

diff --git a/...ts/src/test/scala/weco/pipeline/transformer/mets/transformer/MetsXmlTransformerTest.scala b/...ts/src/test/scala/weco/pipeline/transformer/mets/transformer/MetsXmlTransformerTest.scala
@@ -40,7 +40,7 @@ class MetsXmlTransformerTest
         thumbnailReference = Some(thumbnailRef),
         version = 1,
         modifiedTime = now,
-        locationPrefix = "v2"
+        locationPrefix = "v2/"
       )
     )
   }
@@ -90,7 +90,7 @@ class MetsXmlTransformerTest
         thumbnailReference = Some(thumbnailRef),
         version = 1,
         modifiedTime = now,
-        locationPrefix = "v2"
+        locationPrefix = "v2/"
       )
     )
   }
@@ -133,7 +133,7 @@ class MetsXmlTransformerTest
           MetsAccessConditions(licence = Some(License.InCopyright)),
         version = 1,
         modifiedTime = now,
-        locationPrefix = "v2",
+        locationPrefix = "v2/",
         fileReferences = createFileReferences(2, "b30246039"),
         thumbnailReference = Some(thumbnailRef)
       )