Link role before trying to move to instance

libris · Sep 28, 2023 · 111f421 · 111f421
1 parent 2f758f5
commit 111f421
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/whelk-core/src/main/groovy/whelk/converter/marc/ContributionByRoleStep.groovy b/whelk-core/src/main/groovy/whelk/converter/marc/ContributionByRoleStep.groovy
@@ -2,6 +2,7 @@ package whelk.converter.marc
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Log4j2 as Log
+import whelk.filter.BlankNodeLinker
 
 import static whelk.JsonLd.asList
 
@@ -15,11 +16,17 @@ class ContributionByRoleStep extends MarcFramePostProcStepBase {
 
     boolean requiresResources = true
     Set<String> instanceRelators
+    BlankNodeLinker relatorLinker
 
     void init() {
+        def relatorResources = resourceCache?.relatorResources
+
+        if (!relatorResources) return
+
+        relatorLinker = relatorResources.relatorLinker
         // NOTE: Assuming OK to move role with a non-Instance Embodiment domain (Item
         // or Representation) to Instance (an instance is an embodiment, a work isn't).
-        instanceRelators = resourceCache?.relators?.findResults {
+        instanceRelators = relatorResources.relators.findResults {
             def domainRef = it.domain?[ID]
             if (domainRef) {
               def domain = ld.toTermKey(domainRef)
@@ -28,7 +35,7 @@ class ContributionByRoleStep extends MarcFramePostProcStepBase {
               }
             }
         } as Set
-        log.debug "Using as instance relations: $INSTANCE_RELATORS"
+        log.debug "Using as instance relations: $instanceRelators"
     }
 
     void modify(Map record, Map thing) {
@@ -51,6 +58,7 @@ class ContributionByRoleStep extends MarcFramePostProcStepBase {
         asList(work.contribution).each {
             var instanceRoles = []
             var workRoles = []
+            relatorLinker.linkAll(it, 'role')
             asList(it.role).each {
                 if (it[ID] in instanceRelators) {
                     instanceRoles << it

diff --git a/whelk-core/src/main/resources/ext/marcframe-bib-postproc-contribution.json b/whelk-core/src/main/resources/ext/marcframe-bib-postproc-contribution.json
@@ -43,7 +43,7 @@
               },
               {
                 "role": [
-                  {"@id": "https://id.kb.se/relator/publisher"}
+                  {"code": "pbl"}
                 ],
                 "@type": "Contribution",
                 "agent": {"@id": "y"}
@@ -78,7 +78,30 @@
           ]
         }
       },
-      "back": "source"
+      "back": {
+        "mainEntity": {
+          "@type": "Instance",
+          "instanceOf": {
+            "@type": "Text",
+            "contribution": [
+              {
+                "role": [
+                  {"@id": "https://id.kb.se/relator/author"}
+                ],
+                "@type": "Contribution",
+                "agent": {"@id": "x"}
+              },
+              {
+                "role": [
+                  {"@id": "https://id.kb.se/relator/publisher"}
+                ],
+                "@type": "Contribution",
+                "agent": {"@id": "y"}
+              }
+            ]
+          }
+        }
+      }
     },
     {
       "name": "Split publisher from author and move",