From 26d2f24645ec49de1c6ae879bafd435e8e6d3a22 Mon Sep 17 00:00:00 2001
From: Pascal Christoph <christoph@hbz-nrw.de>
Date: Thu, 29 Aug 2024 12:13:41 +0200
Subject: [PATCH] Switch from submodule "vocabs" to "lbz-vocabs" (#2063)

We now use a dedicated vobas rpo for RPB.

- ad git submodule "lbz-vocabs"
- improve README
- configure start script
---
 .gitmodules                                                 | 3 +++
 README.textile                                              | 3 ++-
 lbz-vocabs                                                  | 1 +
 .../org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 160000 lbz-vocabs

diff --git a/.gitmodules b/.gitmodules
index 6a25c8bfc..993e0f05d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vocabs"]
 	path = vocabs
 	url = https://github.com/lobid/vocabs
+[submodule "lbz-vocabs"]
+	path = lbz-vocabs
+	url = https://github.com/hbz/lbz-vocabs
diff --git a/README.textile b/README.textile
index 6bd1b2136..91f22ee9d 100644
--- a/README.textile
+++ b/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.
diff --git a/lbz-vocabs b/lbz-vocabs
new file mode 160000
index 000000000..e83ed547a
--- /dev/null
+++ b/lbz-vocabs
@@ -0,0 +1 @@
+Subproject commit e83ed547a56ab27703fcaf59cd11878e6930179a
diff --git a/src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java b/src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java
index 221edf1e6..e8fee4eba 100644
--- a/src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java
+++ b/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("rpb2.ttl", "../../../../../../lbz-vocabs/rpb/rpb2.ttl");
+                fixVariables.put("rpb-spatial.ttl", "../../../../../../lbz-vocabs/rpb/rpb-spatial.ttl");
+                fixVariables.put("rpb.ttl", "../../../../../../lbz-vocabs/rpb/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");