Merge branch 'RPB-115-AddToC' of https://github.com/hbz/rpb into main

Resolves https://jira.hbz-nrw.de/browse/RPB-115

See https://rpb.lobid.org/107t182053

app/views/tags/result_doc.scala.html

@@ -7,12 +7,24 @@
 @import controllers.nwbib.Application.CONFIG
 @import controllers.nwbib.Application.ZDB_PREFIX
 
+@idAndLabelLink(e: JsValue) = {
+  <a href='@((e\"id").asOpt[String].getOrElse("--"))'>@((e\"label").asOpt[String].getOrElse("--"))</a>
+}
+
 @labelled(label: String, key: String) = {
   @if((doc\key).asOpt[Seq[JsValue]].isDefined) {
+    @defining((doc\key).asOpt[Seq[JsValue]].getOrElse(Seq(doc\key))) { elems =>
     <tr>
       <td>@label</td>
-      <td><a href='@(((doc\key)(0)\"id").asOpt[String].getOrElse("--"))'>@(((doc\key)(0)\"label").asOpt[String].getOrElse("--"))</a></td>
+      <td>@idAndLabelLink(elems.head.asOpt[JsValue].get)</td>
     </tr>
+      @for(elem <- elems.tail; e <- elem.asOpt[JsValue]) {
+        <tr>
+          <td></td>
+          <td>@idAndLabelLink(e)</td>
+        </tr>
+      }
+    }
   }
 }
 
@@ -267,7 +279,7 @@
 
   @result_field("Schlagwortfolge", "subjectChain", doc, TableRow.VALUES, valueLabel = Option(Seq()))
 
-  @labelled("Inhaltsangabe", "description")
+  @labelled("Weitere Informationen", "description")
   @labelled("Inhaltsverzeichnis", "tableOfContents")
   @labelled("Volltext", "fulltextOnline")
 }

conf/RPB-Export_HBZ_Titel_Test.txt

@@ -69,3 +69,4 @@
 [/]#00 929t930040[/]#20 Sein Werk - nicht das meine : Mutter Magdalena Damen und ihre Kongregation der Franziskanerinnen von Heythuysen im neunzehnten Jahrhundert[/]#22 Moeder Magdalena Damen en de ontwikkeling van haar Congregatie in de negentiende eeuw <dt.>[/]#30 _sn611070_[/]#31 _r99_ _o131000700701_[/]#32 _119067552_ ; _z48_[/]#32a_00Sn93k0040a_ ; _z48_[/]#35 _r99_ _o131000700701_ ; _sn611070_[/]#36 s[/]#37 _sn611070_ ; _r99_ _o131000700701_[/]#39 Angelita Cools ; Hildegard von de Wijnpersse. [Nach Bearb. durch Gian Ackermans ... ][/]#40 _00Pn93k0040b_[/]#401_00Pn93k0040c_[/]#43 _00Pn93k0040d_[/]#71 2. dt. Ausg.[/]#74 Aachen[/]#75 Einhard [u.a.][/]#76a1992[/]#76b1992[/]#77 305 S. : Ill.[/]#81 1. dt. Ausg. u.d.T.: Cools, Angelita: Mutter Magdalena Damen und die Entwicklung ihrer Kongregation im neunzehnten Jahrhundert. - Betr. auch Kloster St. Clemens, Nonnenwerth im Rhein[/]#87 3-920284-67-4[/]#8713-7666-9809-5[/]#90d93/5378[/]#95 ZR-19940228/10:30:52ZR[/]#96 20040213/09:30:16KO[/]
 [/]#00 929t920749[/]#20 Sachstand der heutigen Gew�sserbelastung : Belastung der letzten Jahrzehnte ; Verhalten von Schadstoffen in Gew�ssern ; Schadensf�lle[/]#30 _sn142382_[/]#31 _r22_[/]#32 _z64_ ; _4128022n2_[/]#35 _r22_ ; _sn142382_[/]#36 s[/]#37 _sn142382_ ; _r22_[/]#39 Hubert Hellmann[/]#40 _00Pn92k0749a_[/]#74 Koblenz[/]#75 Bundesanst. f�r Gew�sserkunde[/]#76a1992[/]#76b1992[/]#77 28 Bl. : graph. Darst.[/]#86 BfG-0669[/]#90d92A/173[/]#95 ZR-19930513/09:54:51ZR[/]#96 ZR-19930513/09:54:51ZR[/]
 [/]#00 121t231109[/]#20 �Der� Wiedweg - blaues Wasser, gr�ne Pfade : Etappenwandern von der Quelle bis zur M�ndung[/]#30 _sn102070_[/]#30a_sn102070_[/]#31 _r22_[/]#31a_r10_[/]#32 _929n110124_ ; _4155569n7_[/]#35 _r22_ ; _sn102070_[/]#35a_r10_ ; _sn102070_[/]#36 u[/]#37 _sn102070_ ; _r22_[/]#37a_sn102070_ ; _r10_[/]#70b118[/]#70h3[/]#70j2023[/]#70s48-52[/]#70t�Die� Eifel[/]#76a2023[/]#76b2023[/]#77 Illustrationen[/]#88 0176-8255[/]#90cZ 1666-118(2023)[/]#95 20230927/11:44:46TR[/]#96 20230927/11:44:46TR[/]
+[/]#00 107t182053[/]#20 Friedrich Christian Laukhard (1757-1822) : Schriftsteller, Radikalaufkl�rer und gelehrter Soldat[/]#30 _sn768030_[/]#31 _r99_ _o33105070_[/]#32 _118726692_ ; _4006804n3_[/]#35 _r99_ _o33105070_ ; _sn768030_[/]#36 s[/]#37 _sn768030_ ; _r99_ _o33105070_[/]#39 Guido Naschert (Hg.)[/]#41 _00Gn18s2053186a_[/]#74 Paderborn[/]#75 Ferdinand Sch�ningh[/]#76a[2017][/]#76b2017[/]#77 218 Seiten : Illustrationen, Karte[/]#83 Laukhard, Friedrich Christian / 1757-1822[/]#87 978-3-506-77967-0[/]#90b117-3134[/]#90d2020/1429[/]#90fhttp://digitale-objekte.hbz-nrw.de/storage2/2017/08/19/file_28/7343682.pdf[/]#90ghttps://www.hsozkult.de/publicationreview/id/reb-22111[/]#95 20180620/10:01:03HBZ[/]#96 20200603/09:22:21KO[/]#983HT019399122[/]

conf/output/test-output-84.json

@@ -0,0 +1,75 @@
+{
+  "@context" : "http://lobid.org/resources/context.jsonld",
+  "type" : [ "BibliographicResource", "Book" ],
+  "rpbId" : "107t182053",
+  "id" : "https://lobid.org/resources/107t182053",
+  "hbzId" : "HT019399122",
+  "inCollection" : [ {
+    "id" : "http://lobid.org/resources/HT013494180#!",
+    "type" : [ "Collection" ],
+    "label" : "Rheinland-Pfälzische Bibliographie"
+  } ],
+  "title" : "Friedrich Christian Laukhard (1757-1822) : Schriftsteller, Radikalaufklärer und gelehrter Soldat",
+  "extent" : "218 Seiten : Illustrationen, Karte",
+  "responsibilityStatement" : [ "Guido Naschert (Hg.)" ],
+  "publication" : [ {
+    "location" : [ "Paderborn" ],
+    "publishedBy" : [ "Ferdinand Schöningh" ],
+    "type" : [ "PublicationEvent" ]
+  } ],
+  "subject" : [ {
+    "id" : "http://purl.org/lobid/rpb#n768030",
+    "label" : "Schriftstellerin. Schriftsteller / Sekundärliteratur",
+    "type" : [ "Concept" ],
+    "source" : {
+      "id" : "http://purl.org/lobid/rpb",
+      "label" : "Systematik der Rheinland-Pfälzischen Bibliographie"
+    }
+  }, {
+    "type" : [ "ComplexSubject" ],
+    "label" : "Laukhard, Friedrich Christian / 1757-1822 | Biografie",
+    "componentList" : [ {
+      "id" : "https://d-nb.info/gnd/118726692",
+      "label" : "Laukhard, Friedrich Christian / 1757-1822",
+      "source" : {
+        "id" : "https://d-nb.info/gnd/7749153-1",
+        "label" : "Gemeinsame Normdatei (GND)"
+      }
+    }, {
+      "id" : "https://d-nb.info/gnd/4006804-3",
+      "label" : "Biografie",
+      "source" : {
+        "id" : "https://d-nb.info/gnd/7749153-1",
+        "label" : "Gemeinsame Normdatei (GND)"
+      }
+    } ]
+  } ],
+  "spatial" : [ {
+    "id" : "https://rpb.lobid.org/spatial#n33105070",
+    "label" : "Wendelsheim",
+    "type" : [ "Concept" ],
+    "source" : {
+      "id" : "https://rpb.lobid.org/spatial",
+      "label" : "RPB-Raumsystematik"
+    }
+  } ],
+  "contribution" : [ {
+    "agent" : {
+      "id" : "https://rpb.lobid.org/agent/00Gn18s2053186a",
+      "label" : "Naschert, Guido",
+      "type" : [ "Person" ]
+    },
+    "role" : {
+      "id" : "http://id.loc.gov/vocabulary/relators/pbl",
+      "label" : "Herausgeber"
+    },
+    "type" : [ "Contribution" ]
+  } ],
+  "description" : [ {
+    "id" : "http://digitale-objekte.hbz-nrw.de/storage2/2017/08/19/file_28/7343682.pdf",
+    "label" : "http://digitale-objekte.hbz-nrw.de/storage2/2017/08/19/file_28/7343682.pdf"
+  }, {
+    "id" : "https://www.hsozkult.de/publicationreview/id/reb-22111",
+    "label" : "https://www.hsozkult.de/publicationreview/id/reb-22111"
+  } ]
+}

conf/output/test-output-strapi.json

@@ -82,3 +82,4 @@
 {"f00_":"929t930040","f20_":"Sein Werk - nicht das meine : Mutter Magdalena Damen und ihre Kongregation der Franziskanerinnen von Heythuysen im neunzehnten Jahrhundert","f22_":"Moeder Magdalena Damen en de ontwikkeling van haar Congregatie in de negentiende eeuw <dt.>","f30_":"_sn611070_","f31_":"_r99_ _o131000700701_","f32_":"_119067552_ ; _z48_","f32a":"_00Sn93k0040a_ ; _z48_","f35_":"_r99_ _o131000700701_ ; _sn611070_","f36_":"Monografie","f37_":"_sn611070_ ; _r99_ _o131000700701_","f39_":"Angelita Cools ; Hildegard von de Wijnpersse. [Nach Bearb. durch Gian Ackermans ... ]","f40_":"_00Pn93k0040b_","f401":"_00Pn93k0040c_","f43_":"_00Pn93k0040d_","f71_":"2. dt. Ausg.","f74_":"Aachen","f75_":"Einhard [u.a.]","f76a":"1992","f76b":"1992","f77_":"305 S. : Ill.","f81_":"1. dt. Ausg. u.d.T.: Cools, Angelita: Mutter Magdalena Damen und die Entwicklung ihrer Kongregation im neunzehnten Jahrhundert. - Betr. auch Kloster St. Clemens, Nonnenwerth im Rhein","f87_":"3-920284-67-4","f871":"3-7666-9809-5","f90d":"93/5378","f95_":"ZR-19940228/10:30:52\u001FZR","f96_":"20040213/09:30:16\u001FKO","f30":[{"f30_":"http://purl.org/lobid/rpb#n611070"}],"f31":[{"f31_":"https://rpb.lobid.org/spatial#n131000700701"}],"f32":[{"f32_":[{"f32_":"https://d-nb.info/gnd/119067552"},{"f32_":"https://rpb.lobid.org/sw/z48"}]},{"f32_":[{"f32_":"https://rpb.lobid.org/sw/00Sn93k0040a"},{"f32_":"https://rpb.lobid.org/sw/z48"}]}],"f81":[{"f81_":"1. dt. Ausg. u.d.T.: Cools, Angelita: Mutter Magdalena Damen und die Entwicklung ihrer Kongregation im neunzehnten Jahrhundert. - Betr. auch Kloster St. Clemens, Nonnenwerth im Rhein"}],"f40":[{"f40_":"https://rpb.lobid.org/agent/00Pn93k0040b","n40a":"http://id.loc.gov/vocabulary/relators/aut"},{"f40_":"https://rpb.lobid.org/agent/00Pn93k0040c","n40a":"http://id.loc.gov/vocabulary/relators/aut"},{"f40_":"https://rpb.lobid.org/agent/00Pn93k0040d","n40a":"http://id.loc.gov/vocabulary/relators/edt"}],"f18_":"nur RPB","f87":[{"f87_":"3-920284-67-4","n87":true},{"f87_":"3-7666-9809-5","n87":true}]}
 {"f00_":"929t920749","f20_":"Sachstand der heutigen Gewässerbelastung : Belastung der letzten Jahrzehnte ; Verhalten von Schadstoffen in Gewässern ; Schadensfälle","f30_":"_sn142382_","f31_":"_r22_","f32_":"_z64_ ; _4128022n2_","f35_":"_r22_ ; _sn142382_","f36_":"Monografie","f37_":"_sn142382_ ; _r22_","f39_":"Hubert Hellmann","f40_":"_00Pn92k0749a_","f74_":"Koblenz","f75_":"Bundesanst. für Gewässerkunde","f76a":"1992","f76b":"1992","f77_":"28 Bl. : graph. Darst.","f86_":"BfG-0669","f90d":"92A/173","f95_":"ZR-19930513/09:54:51\u001FZR","f96_":"ZR-19930513/09:54:51\u001FZR","f30":[{"f30_":"http://purl.org/lobid/rpb#n142382"}],"f31":[{"f31_":"https://rpb.lobid.org/spatial#n22"}],"f32":[{"f32_":[{"f32_":"https://rpb.lobid.org/sw/z64"},{"f32_":"https://d-nb.info/gnd/4128022-2"}]}],"f40":[{"f40_":"https://rpb.lobid.org/agent/00Pn92k0749a","n40a":"http://id.loc.gov/vocabulary/relators/aut"}],"f18_":"nur RPB"}
 {"f00_":"121t231109","f20_":"¬Der¬ Wiedweg - blaues Wasser, grüne Pfade : Etappenwandern von der Quelle bis zur Mündung","f30_":"_sn102070_","f30a":"_sn102070_","f31_":"_r22_","f31a":"_r10_","f32_":"_929n110124_ ; _4155569n7_","f35_":"_r22_ ; _sn102070_","f35a":"_r10_ ; _sn102070_","f36_":"u","f37_":"_sn102070_ ; _r22_","f37a":"_sn102070_ ; _r10_","f70b":"118","f70h":"3","f70j":"2023","f70s":"48-52","f70t":"¬Die¬ Eifel","f76a":"2023","f76b":"2023","f77_":"Illustrationen","f88_":"0176-8255","f90c":"Z 1666-118(2023)","f95_":"20230927/11:44:46\u001FTR","f96_":"20230927/11:44:46\u001FTR","f30":[{"f30_":"http://purl.org/lobid/rpb#n102070"},{"f30_":"http://purl.org/lobid/rpb#n102070"}],"f31":[{"f31_":"https://rpb.lobid.org/spatial#n22"},{"f31_":"https://rpb.lobid.org/spatial#n10"}],"f32":[{"f32_":[{"f32_":"https://rpb.lobid.org/sw/929n110124"},{"f32_":"https://d-nb.info/gnd/4155569-7"}]}],"f70":[{"f70_":"s. spez. Felder f70b ff."}],"f18_":"nur RPB"}
+{"f00_":"107t182053","f20_":"Friedrich Christian Laukhard (1757-1822) : Schriftsteller, Radikalaufklärer und gelehrter Soldat","f30_":"_sn768030_","f31_":"_r99_ _o33105070_","f32_":"_118726692_ ; _4006804n3_","f35_":"_r99_ _o33105070_ ; _sn768030_","f36_":"Monografie","f37_":"_sn768030_ ; _r99_ _o33105070_","f39_":"Guido Naschert (Hg.)","f41_":"_00Gn18s2053186a_","f74_":"Paderborn","f75_":"Ferdinand Schöningh","f76a":"[2017]","f76b":"2017","f77_":"218 Seiten : Illustrationen, Karte","f83_":"Laukhard, Friedrich Christian / 1757-1822","f87_":"978-3-506-77967-0","f90b":"117-3134","f90d":"2020/1429","f95_":"20180620/10:01:03\u001FHBZ","f96_":"20200603/09:22:21\u001FKO","f983":"HT019399122","f30":[{"f30_":"http://purl.org/lobid/rpb#n768030"}],"f31":[{"f31_":"https://rpb.lobid.org/spatial#n33105070"}],"f32":[{"f32_":[{"f32_":"https://d-nb.info/gnd/118726692"},{"f32_":"https://d-nb.info/gnd/4006804-3"}]}],"f90":[{"f90_":"http://digitale-objekte.hbz-nrw.de/storage2/2017/08/19/file_28/7343682.pdf","n90":"Inhaltstext"},{"f90_":"https://www.hsozkult.de/publicationreview/id/reb-22111","n90":"Inhaltsverzeichnis"}],"f40":[{"f40_":"https://rpb.lobid.org/agent/00Gn18s2053186a","n40a":"http://id.loc.gov/vocabulary/relators/pbl"}],"f18_":"nur RPB","f87":[{"f87_":"978-3-506-77967-0","n87":true}]}

conf/rpb-titel-to-lobid.fix

@@ -323,17 +323,29 @@ elsif exists ("f709")
 end
 replace_all("bibliographicCitation","¬","")
 
-# fulltextOnline
+# fulltextOnline and link to external description/ToC
+
+if any_match("f90[].*.n90", "Inhaltsverzeichnis|Inhaltstext")
+  set_array("description[]")
+end
 
 do list(path:"f90[]", "var": "$i")
   if all_equal("$i.n90", "Volltext")
     set_array("fulltextOnline[]")
     copy_field("$i.f90_", "fulltextOnline[].$append.id")
     copy_field("$i.f90_", "fulltextOnline[].$last.label")
     replace_all("fulltextOnline[].$last.label", "https://nbn-resolving.org/", "")
+
+  elsif all_equal("$i.n90", "Inhaltstext")
+    copy_field("$i.f90_", "description[].$append.id")
+    copy_field("$i.f90_", "description[].$last.label") 
+
+  elsif all_equal("$i.n90", "Inhaltsverzeichnis")
+    copy_field("$i.f90_", "description[].$append.id")
+    copy_field("$i.f90_", "description[].$last.label")
   end
 end
 
-retain( "type[]", "contribution[]", "extent", "hasItem[]", "responsibilityStatement[]", "language[]", "medium[]", "subject[]", "title", "hbzId", "oclcNumber[]", "otherTitleInformation[]", "natureOfContent[]", "publication[]", "sameAs[]", "describedBy", "@context", "id", "zdbId", "spatial[]", "inCollection[]", "rpbId", "schoeneNummer", "bibliographicCitation", "isPartOf[]", "note[]", "fulltextOnline[]")
+retain( "type[]", "contribution[]", "extent", "hasItem[]", "responsibilityStatement[]", "language[]", "medium[]", "subject[]", "title", "hbzId", "oclcNumber[]", "otherTitleInformation[]", "natureOfContent[]", "publication[]", "sameAs[]", "describedBy", "@context", "id", "zdbId", "spatial[]", "inCollection[]", "rpbId", "schoeneNummer", "bibliographicCitation", "isPartOf[]", "note[]", "fulltextOnline[]", "description[]")
 
 vacuum()

conf/rpb-titel-to-strapi.fix

@@ -34,7 +34,7 @@ do put_macro("add_url")
   if exists("$[from]")
     if all_match("$[from]", "(https?|ftp):\\/\\/(\\S+\\.)+\\S+(\\/\\S*)?|")
       move_field("$[from]", "f90[].$append.f90_")
-      add_field("f90[].*.n90", "$[type]")
+      set_field("f90[].$last.n90", "$[type]")
     end
   end
 end
@@ -152,7 +152,9 @@ call_macro("add_all", to: "85", from: "85?") # Gesamttitel
 set_array("f90[]")
 
 call_macro("add_url", from: "f90e", type: "Volltext")
-call_macro("add_url", from: "f90f", type: "Andere URL")
+call_macro("add_url", from: "f90f", type: "Inhaltstext")
+call_macro("add_url", from: "f90g", type: "Inhaltsverzeichnis")
+
 
 # Signatur
 set_array("f90a[]")