Merge branch 'rpb-251-externalRecords' of https://github.com/hbz/rpb into main

fsteeg · fsteeg · commit c6b3dc7b4248 · 2025-03-13T12:32:31.000+01:00
Resolves https://jira.hbz-nrw.de/browse/RPB-251
diff --git a/app/controllers/nwbib/Application.java b/app/controllers/nwbib/Application.java
@@ -1028,6 +1028,8 @@ private static JsonNode mergeRecords(JsonNode transformedJson, JsonNode lobidJso
 		MapType mapType = TypeFactory.defaultInstance().constructMapType(Map.class, String.class, Object.class);
 		Map<String, Object> transformedMap = objectMapper.readValue(transformedJson.toString(), mapType);
 		Map<String, Object> lobidMap = objectMapper.readValue(lobidJson.toString(), mapType);
+		lobidMap.remove("describedBy");
+		transformedMap.put("hbzId", lobidMap.get("hbzId"));
 		transformedMap.remove("type");
 		transformedMap.keySet().forEach(key -> {
 			Object transformedObject = transformedMap.get(key);
diff --git a/conf/output/test-output-34.json b/conf/output/test-output-34.json
@@ -16,8 +16,5 @@
     "type" : [ "Collection" ],
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
-  "title" : "SWR-3-Clubmagazin : 1998,1(Sept.) -",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "title" : "SWR-3-Clubmagazin : 1998,1(Sept.) -"
 }
diff --git a/conf/output/test-output-36.json b/conf/output/test-output-36.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "On : SWF 3, das Magazin : 1992 - 1998,2",
-  "note" : [ "Damit Erscheinen eingest. - Forts. u.d.T.: SWR-3-Clubmagazin" ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "note" : [ "Damit Erscheinen eingest. - Forts. u.d.T.: SWR-3-Clubmagazin" ]
 }
diff --git a/conf/output/test-output-38.json b/conf/output/test-output-38.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "Die Zeitschrift : der Südwestrundfunk und seine Programme. Rheinland-Pfalz : 1998,1(Sept.) - 2001,9(Sept.)",
-  "note" : [ "Forts. u.d.T.: Doppelpfeil" ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "note" : [ "Forts. u.d.T.: Doppelpfeil" ]
 }
diff --git a/conf/output/test-output-40.json b/conf/output/test-output-40.json
@@ -16,8 +16,5 @@
     "type" : [ "Collection" ],
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
-  "title" : "Flieg und flatter : Aktuelles aus der Vogelschutzwarte : Ausg. 1.1997(Dez.) -",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "title" : "Flieg und flatter : Aktuelles aus der Vogelschutzwarte : Ausg. 1.1997(Dez.) -"
 }
diff --git a/conf/output/test-output-42.json b/conf/output/test-output-42.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "Der Rasenspieler : das Journal zur Saison ... : Nachgewiesen 1998/99(1998) - 2000/01; 2001/02 - 2002/03",
-  "note" : [ "Damit Erscheinen eingest." ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "note" : [ "Damit Erscheinen eingest." ]
 }
diff --git a/conf/output/test-output-44.json b/conf/output/test-output-44.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "'s Derfsche : Ebertsheim-Rodenbach, das Dorf im Grünen : 1998,Apr.",
-  "note" : [ "Mit dieser Ausg. Erscheinen eingest." ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "note" : [ "Mit dieser Ausg. Erscheinen eingest." ]
 }
diff --git a/conf/output/test-output-48.json b/conf/output/test-output-48.json
@@ -12,9 +12,6 @@
   "title" : "Geheimnisvolle Tierwelten : am Flüsschen Wied gesehen und photographiert ; [Kalender] 2011",
   "extent" : "[14] Bl. : überw. Ill. ; 210 x 297 mm",
   "responsibilityStatement" : [ "von Erich Oetz" ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ],
   "subject" : [ {
     "id" : "http://purl.org/lobid/rpb#n848000",
     "label" : "Fotografie",
diff --git a/conf/output/test-output-51.json b/conf/output/test-output-51.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "Aktuell : das Krankenhaus in Ihrer Region : Nachgewiesen 2010 - 2012,1",
-  "note" : [ "Nachfolger: Kaleidoskop. 2012 -" ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "note" : [ "Nachfolger: Kaleidoskop. 2012 -" ]
 }
diff --git a/conf/output/test-output-53.json b/conf/output/test-output-53.json
@@ -16,8 +16,5 @@
     "type" : [ "Collection" ],
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
-  "title" : "Clubzeitung : Nachgewiesen 2006,2 -",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "title" : "Clubzeitung : Nachgewiesen 2006,2 -"
 }
diff --git a/conf/output/test-output-60.json b/conf/output/test-output-60.json
@@ -16,8 +16,5 @@
     "type" : [ "Collection" ],
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
-  "title" : "Rhein-Zeitung : unabhängige Tageszeitung : 66.2011,77(1.Apr.) -",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "title" : "Rhein-Zeitung : unabhängige Tageszeitung : 66.2011,77(1.Apr.) -"
 }
diff --git a/conf/output/test-output-75.json b/conf/output/test-output-75.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "Piffche-Bahnfahrt durch Rheinhessen : [1]",
-  "extent" : "240 Seiten : Illustrationen",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "extent" : "240 Seiten : Illustrationen"
 }
diff --git a/conf/output/test-output-76.json b/conf/output/test-output-76.json
@@ -17,8 +17,5 @@
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
   "title" : "Piffche-Bahnfahrt durch Rheinhessen : 2",
-  "extent" : "256 Seiten : Illustrationen",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "extent" : "256 Seiten : Illustrationen"
 }
diff --git a/conf/output/test-output-78.json b/conf/output/test-output-78.json
@@ -16,8 +16,5 @@
     "type" : [ "Collection" ],
     "label" : "Rheinland-Pfälzische Bibliographie"
   } ],
-  "title" : "Bibliographie zu den Jahrbüchern des Kreises Daun : 1973/90 (1990) -",
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ]
+  "title" : "Bibliographie zu den Jahrbüchern des Kreises Daun : 1973/90 (1990) -"
 }
diff --git a/conf/output/test-output-79.json b/conf/output/test-output-79.json
@@ -11,9 +11,6 @@
   } ],
   "title" : "Einfluss von Lesetermin und Mostbehandlung auf die Alterung von Weißwein, am Beispiel von Vitis vinifera L. cv. Riesling.",
   "responsibilityStatement" : [ "Aus f39x: Geisenheim: Ges. zur Förderung der Forschungsanst. Geisenheim 2013." ],
-  "publication" : [ {
-    "type" : [ "PublicationEvent" ]
-  } ],
   "subject" : [ {
     "type" : [ "ComplexSubject" ],
     "label" : "Most | Lebensmittelverarbeitung | Riesling | Chemie | Wein | Weinlese | Lebensmittelqualität",
diff --git a/conf/rpb-titel-to-lobid.fix b/conf/rpb-titel-to-lobid.fix
@@ -190,11 +190,15 @@ end
 # replace_all("pub.startDate","^\\[(\\d{4})\\]","$1")
 set_array("pub.publishedBy[]")
 copy_field("publishedBy", "pub.publishedBy[].$append")
-set_array("pub.type[]")
-add_field("pub.type[].$append", "PublicationEvent")
 set_array("publication[]")
 move_field("pub", "publication[]")
 
+# Type nur bei tatsächlich befüllten Einträgen setzen:
+vacuum()
+do list_as("pub": "publication[]")
+  set_array("pub.type[]", "PublicationEvent")
+end
+
 # ------- "zdbId" -------
 
 if any_equal("type", "Mehrt. Mono (ÜO)")
