Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from submodule "vocabs" to "lbz-vocabs" #2064

Merged
merged 5 commits into from
Sep 5, 2024
Merged

Switch from submodule "vocabs" to "lbz-vocabs" #2064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61ea3be
Switch from submodule "vocabs" to "lbz-vocabs" (#2063)
dr0i Aug 29, 2024
d2bc628
Update AlmaMarcXmlFix2lobidJsonEs.java
TobiasNx Sep 3, 2024
0986045
Change rpb2.ttl name to lbz-notationen.ttl
TobiasNx Sep 3, 2024
18532f3
Fix test workflow #2063
TobiasNx Sep 3, 2024
46aa4f0
Correct path to lbz-vocabs submodul files #2063
TobiasNx Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion README.textile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions lbz-vocabs
Open in desktop
Submodule lbz-vocabs added at e83ed5
6 changes: 3 additions & 3 deletions src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link
Contributor

@acka47 acka47 Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file will finally most probably be renamed to lbz-notationen.ttl, see hbz/lbz-vocabs@38b3e89

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means, we should wait with mergin this until hbz/lbz-vocabs#6 is merged and adjust the file name if necessary.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have made a separate PR for changing the file name at hbz/lbz-vocabs#7 so that we can move on with this PR. @TobiasNx will review over there.

fixVariables.put("rpb-spatial.ttl", "../../../../../../lbz-vocabs/rpb/rpb-spatial.ttl");
fixVariables.put("rpb.ttl", "../../../../../../lbz-vocabs/rpb/rpb.ttl");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no rpb directory in https://github.com/hbz/lbz-vocabs . I guess that rpb-subdirectory has just to be removed here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right!!! thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

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");
Expand Down
Loading