Merge #2064 from branch '2063-configureLbzVocabsSubmodule' of github.…

…com:hbz/lobid-resources

.gitmodules

@@ -4,3 +4,7 @@
 [submodule "vocabs"]
 	path = vocabs
 	url = https://github.com/lobid/vocabs
+[submodule "lbz-vocabs"]
+	path = lbz-vocabs
+	url = https://github.com/hbz/lbz-vocabs
+	branch = main

README.textile

@@ -114,8 +114,9 @@ You're done :)
 
 h2. Tables as gitsubmodules
 
-Some lookup tables are provided through gitsubmodules.
+Some lookup tables are provided through gitsubmodules (s. @.gitmodules@).
 To initialize the submodules do @git submodule update --init --remote@.
+To add a submodule do @git submodule add $repoUrl@.
  To make a @git pull@ also
 update these tables you can e.g. do @git config --local submodule.recurse true@ once and @git submodule update --recursive --remote@ after every @git pull@ ! This is necessary
 to be on the HEAD of the master of the submodules.

src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java

@@ -128,9 +128,9 @@ public void run() {
                 fixVariables.put("rvk.tsv", "../../../../../../lookup-tables/data/rvk.tsv");
                 fixVariables.put("lobidOrganisationsMapping.tsv", "./maps/lobidOrganisationsMapping.tsv");
                 fixVariables.put("hbzowner2sigel.tsv", "./maps/hbzowner2sigel.tsv");
-                fixVariables.put("rpb2.ttl", "../../../../../../vocabs/rpb/rpb2.ttl");
-                fixVariables.put("rpb-spatial.ttl", "../../../../../../vocabs/rpb/rpb-spatial.ttl");
-                fixVariables.put("rpb.ttl", "../../../../../../vocabs/rpb/rpb.ttl");
+                fixVariables.put("lbz-notationen.ttl", "../../../../../../lbz-vocabs/lbz-notationen.ttl");
+                fixVariables.put("rpb-spatial.ttl", "../../../../../../lbz-vocabs/rpb-spatial.ttl");
+                fixVariables.put("rpb.ttl", "../../../../../../lbz-vocabs/rpb.ttl");
                 fixVariables.put("nwbib.ttl", "../../../../../../vocabs/nwbib/nwbib.ttl");
                 fixVariables.put("nwbib-spatial.ttl", "../../../../../../vocabs/nwbib/nwbib-spatial.ttl");
                 fixVariables.put("hbzId2zdbId.tsv", "./maps/hbzId2zdbId.tsv.gz");

src/main/resources/alma/fix/maps.fix

@@ -30,7 +30,7 @@ put_filemap("$[classification.tsv]","classificationCode2Uri", sep_char:"\t",key_
 put_filemap("$[rvk.tsv]","rvk", sep_char:"\t")
 
 # RPB SKOS Maps
-put_rdfmap("$[rpb2.ttl]", "rpb2", target: "skos:prefLabel", select_language: "de") # LBZ-Notationen aka rpb2 fka RPB-Sachgruppen und Zusätze
+put_rdfmap("$[lbz-notationen.ttl]", "lbz-notationen", target: "skos:prefLabel", select_language: "de") # LBZ-Notationen fka rpb2 fka RPB-Sachgruppen und Zusätze
 put_rdfmap("$[rpb-spatial.ttl]", "rpbr", target: "skos:prefLabel", select_language: "de") # RPB-Raumsystematik aka rpbr
 put_rdfmap("$[rpb.ttl]", "rpb", target: "skos:prefLabel", select_language: "de") # RPB-Sachsystematik fka. Systematik der Rheinland-Pfälzischen Bibliographie
 

src/main/resources/alma/fix/subjects.fix

@@ -271,14 +271,14 @@ do list(path:"084??", "var":"$i")
         do list(path:"$i.a", "var":"$j")
           copy_field("$j", "subject[].$append.notation")
           set_array("subject[].$last.type[]","Concept")
-          # LBZ-Notationen aka rpb2 fka RPB-Sachgruppen und Zusätze
+          # LBZ-Notationen fka rpb2 fka RPB-Sachgruppen und Zusätze
           if any_match("$i.2", "rpb")
             if any_match("$j","\\d{3}")
-              copy_field("$j","$i.@rpb2NotationId")
-              prepend("$i.@rpb2NotationId","https://w3id.org/lobid/rpb2#n")
-              copy_field("$i.@rpb2NotationId","subject[].$last.id")
-              lookup("$i.@rpb2NotationId","rpb2")
-              move_field("$i.@rpb2NotationId","subject[].$last.label")
+              copy_field("$j","$i.@lbz-notationenId")
+              prepend("$i.@lbz-notationenId","https://w3id.org/lobid/rpb2#n")
+              copy_field("$i.@lbz-notationenId","subject[].$last.id")
+              lookup("$i.@lbz-notationenId","lbz-notationen")
+              move_field("$i.@lbz-notationenId","subject[].$last.label")
               add_field("subject[].$last.source.id", "https://w3id.org/lobid/rpb2")
               add_field("subject[].$last.source.label", "LBZ-Notationen")
             # RPB-Sachsystematik fka. Systematik der Rheinland-Pfälzischen Bibliographie

src/test/java/org/lobid/resources/AlmaMarc21XmlToLobidJsonMetafixTest.java

@@ -72,7 +72,7 @@ public void setup() {
         fixVariables.put("rvk.tsv", "src/test/resources/cg/rvk.tsv");
         fixVariables.put("lobidOrganisationsMapping.tsv", "src/test/resources/alma/maps/lobidOrganisationsMapping.tsv");
         fixVariables.put("hbzowner2sigel.tsv", "src/main/resources/alma/maps/hbzowner2sigel.tsv");
-        fixVariables.put("rpb2.ttl", "src/test/resources/alma/maps/rpb2.ttl");
+        fixVariables.put("lbz-notationen.ttl", "src/test/resources/alma/maps/lbz-notationen.ttl");
         fixVariables.put("rpb-spatial.ttl", "src/test/resources/alma/maps/rpb-spatial.ttl");
         fixVariables.put("rpb.ttl", "src/test/resources/alma/maps/rpb.ttl");
         fixVariables.put("nwbib.ttl", "src/test/resources/alma/maps/nwbib.ttl");