Merge branch 'master' into DeleteUnnecessaryIsilRedirectLookup

hbz · Sep 28, 2023 · 7124232 · 7124232
2 parents 5c20375 + 239ea74
commit 7124232
Show file tree

Hide file tree

Showing 19 changed files with 598 additions and 6,243 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "lookup-tables"]
+	path = lookup-tables
+	url = https://github.com/hbz/lookup-tables
+[submodule "vocabs"]
+	path = vocabs
+	url = https://github.com/lobid/vocabs
+[submodule "link-templates"]
+	path = link-templates
+	url = https://github.com/hbz/link-templates
diff --git a/README.textile b/README.textile
@@ -102,6 +102,10 @@ If you've added and commited everything, check again if all is ok:
 
 This should result in *BUILD SUCCESS*. Push your changes. You're done :)
 
+h2. Tables as gitsubmodules
+Some lookup tables are provided through gitsubmodules. To make a @git pull@ also
+update these tables you can e.g. do @git config --local submodule.recurse true@ once.
+
 h2. Propagate the context.json to lobid-resources-web
 
 The generated _context.jsonld_ is automatically written to the proper directory

diff --git a/link-templates b/link-templates
diff --git a/lookup-tables b/lookup-tables
diff --git a/src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java b/src/main/java/org/lobid/resources/run/AlmaMarcXmlFix2lobidJsonEs.java
@@ -116,22 +116,20 @@ public void run() {
                 fixVariables.put("institution-code", "DE-605");
                 // the './' is mandatory to get play to use the "conf" directory. Base is the root directory of the fix, which is "alma":
                 fixVariables.put("deweyLabels", "./maps/deweyLabels.tsv");
-                fixVariables.put("dnbSachgruppen", "./maps/dnbSachgruppen.tsv");                
-                fixVariables.put("nwbib-spatial", "./../nwbib-spatial.tsv");
-                fixVariables.put("wd_itemLabelTypesCoordinates", "./../wd_itemLabelTypesCoordinates.tsv");
+                fixVariables.put("dnbSachgruppen", "./maps/dnbSachgruppen.tsv");
                 fixVariables.put("maps-institutions.tsv", "./maps/institutions.tsv");
-                fixVariables.put("sublibraryIsil", "./maps/generatedAlmaSublibraryCode2Isil.tsv");
-                fixVariables.put("suppressedLocations", "./maps/generatedAlmaSuppressedLocations.tsv");                
+                fixVariables.put("sublibraryIsil", "../../../../../../lookup-tables/data/almaSublibraryCode2Isil/generated/generatedAlmaSublibraryCode2Isil.tsv");
+                fixVariables.put("suppressedLocations", "../../../../../../lookup-tables/data/almaSuppressedLocations/generated/generatedAlmaSuppressedLocations.tsv");                
                 fixVariables.put("picaCreatorId2Isil.tsv", "./maps/picaCreatorId2Isil.tsv");
                 fixVariables.put("nwbibWikidataLabelTypeCoords.tsv", "./maps/nwbibWikidataLabelTypeCoords.tsv");
                 fixVariables.put("classification.tsv", "./maps/classification.tsv");
                 fixVariables.put("formangabe.tsv", "./maps/formangabe.tsv");
-                fixVariables.put("almaMmsId2rpbId", "./maps/almaMmsId2rpbId.tsv");
+                fixVariables.put("almaMmsId2rpbId", "../../../../../../lookup-tables/data/almaMmsId2rpbId.tsv");
                 fixVariables.put("lobidOrganisationsMapping.tsv", "./maps/lobidOrganisationsMapping.tsv");
                 fixVariables.put("hbzowner2sigel.tsv", "./maps/hbzowner2sigel.tsv");
-                fixVariables.put("rpb2.ttl", "./maps/rpb2.ttl");
-                fixVariables.put("rpb-spatial.ttl", "./maps/rpb-spatial.ttl");
-                fixVariables.put("rpb.ttl", "./maps/rpb.ttl");
+                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("hbzId2zdbId.tsv", "./maps/hbzId2zdbId.tsv.gz");
 
                 XmlElementSplitter xmlElementSplitter = new XmlElementSplitter();

diff --git a/src/main/resources/alma/fix/macros.fix b/src/main/resources/alma/fix/macros.fix
@@ -42,8 +42,9 @@ do put_macro("alternateGraphicRepresationIsPartOf")
           end
         else    
           copy_field("$880.@script.id","alternateGraphicRepresentation[].$append.script.id")
-          copy_field("$880.@script.label","alternateGraphicRepresentation[].$last.script.label")        
-          set_array("alternateGraphicRepresentation[].$last.record.isPartOf[].$last.hasSuperordinate[].$append")
+          copy_field("$880.@script.label","alternateGraphicRepresentation[].$last.script.label")
+          set_array("alternateGraphicRepresentation[].$last.record.isPartOf[]")        
+          set_array("alternateGraphicRepresentation[].$last.record.isPartOf[].$append.hasSuperordinate[]")
           copy_field("$880.a","alternateGraphicRepresentation[].$last.record.isPartOf[].$last.hasSuperordinate[].$append.label")
           copy_field("$880.v", "alternateGraphicRepresentation[].$last.record.isPartOf[].$last.numbering")
         end

diff --git a/src/main/resources/labels/context-labels.json b/src/main/resources/labels/context-labels.json
@@ -759,5 +759,246 @@
     "multilangLabel": {},
     "name": "langNote",
     "uri": "http://purl.org/lobid/lv#langNote"
+  },
+  {
+    "uri": "https://d-nb.info/standards/elementset/gnd#ConferenceOrEvent",
+    "multilangLabel": {},
+    "name": "ConferenceOrEvent"
+  },
+  {
+    "name": "CorporateBody",
+    "multilangLabel": {},
+    "uri": "https://d-nb.info/standards/elementset/gnd#CorporateBody"
+  },
+  {
+    "name": "Family",
+    "uri": "https://d-nb.info/standards/elementset/gnd#Family",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Person",
+    "multilangLabel": {},
+    "uri": "https://d-nb.info/standards/elementset/gnd#Person"
+  },
+  {
+    "uri": "https://d-nb.info/standards/elementset/gnd#PlaceOrGeographicName",
+    "multilangLabel": {},
+    "name": "PlaceOrGeographicName"
+  },
+  {
+    "uri": "https://d-nb.info/standards/elementset/gnd#SubjectHeading",
+    "multilangLabel": {},
+    "name": "SubjectHeading"
+  },
+  {
+    "name": "Work",
+    "uri": "https://d-nb.info/standards/elementset/gnd#Work",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Item",
+    "multilangLabel": {},
+    "uri": "http://id.loc.gov/ontologies/bibframe/Item"
+  },
+  {
+    "multilangLabel": {},
+    "name": "CreateAction",
+    "uri": "http://schema.org/CreateAction"
+  },
+  {
+    "multilangLabel": {},
+    "name": "DataFeedItem",
+    "uri": "http://schema.org/DataFeedItem"
+  },
+  {
+    "multilangLabel": {},
+    "name": "SoftwareApplication",
+    "uri": "http://schema.org/SoftwareApplication"
+  },
+  {
+    "label": "Kombination",
+    "multilangLabel": {},
+    "name": "Combination",
+    "uri": "http://iflastandards.info/ns/isbd/terms/mediatype/T1008"
+  },
+  {
+    "multilangLabel": {},
+    "name": "Contribution",
+    "uri": "http://id.loc.gov/ontologies/bibframe/Contribution",
+    "label": "Mitwirkung"
+  },
+  {
+    "uri": "http://www.loc.gov/mads/rdf/v1#ComplexSubject",
+    "name": "ComplexSubject",
+    "multilangLabel": {}
+  },
+  {
+    "uri": "http://www.w3.org/2004/02/skos/core#Concept",
+    "name": "Concept",
+    "multilangLabel": {}
+  },
+  {
+    "uri": "http://id.loc.gov/ontologies/bibframe/Collection",
+    "multilangLabel": {},
+    "name": "Collection"
+  },
+  {
+    "name": "IsPartOfRelation",
+    "label": "IsPartOfRelation",
+    "uri": "http://purl.org/lobid/lv#IsPartOfRelation",
+    "multilangLabel": {}
+  },
+  {
+    "uri": "http://schema.org/PublicationEvent",
+    "multilangLabel": {},
+    "name": "PublicationEvent"
+  },
+  {
+    "name": "SecondaryPublicationEvent",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#SecondaryPublicationEvent"
+  },
+  {
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#ArchivedWebPage",
+    "name": "ArchivedWebPage"
+  },
+  {
+    "name": "Article",
+    "multilangLabel": {},
+    "uri": "http://purl.org/ontology/bibo/Article"
+  },
+  {
+    "name": "BibliographicResource",
+    "uri": "http://purl.org/dc/terms/BibliographicResource",
+    "multilangLabel": {}
+  },
+  {
+    "name": "BibliographicDescription",
+    "uri": "http://purl.org/lobid/lv#BibliographicDescription",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Bibliography",
+    "uri": "http://purl.org/lobid/lv#Bibliography",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Biography",
+    "uri": "http://purl.org/lobid/lv#Biography",
+    "multilangLabel": {}
+  },
+  {
+    "uri": "http://purl.org/ontology/bibo/Book",
+    "multilangLabel": {},
+    "name": "Book"
+  },
+  {
+    "name": "EditedVolume",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#EditedVolume"
+  },
+  {
+    "name": "Festschrift",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#Festschrift"
+  },
+  {
+    "name": "Game",
+    "uri": "http://schema.org/Game",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Image",
+    "multilangLabel": {},
+    "label": "Bild",
+    "uri": "http://purl.org/ontology/bibo/Image"
+  },
+  {
+    "label": "Karte",
+    "multilangLabel": {},
+    "name": "Map",
+    "uri": "http://purl.org/ontology/bibo/Map"
+  },
+  {
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#Legislation",
+    "name": "Legislation"
+  },
+  {
+    "name": "Sonstige",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#Miscellaneous"
+  },
+  {
+    "name": "MultiVolumeBook",
+    "uri": "http://purl.org/ontology/bibo/MultiVolumeBook",
+    "multilangLabel": {}
+  },
+  {
+    "uri": "http://purl.org/ontology/bibo/Newspaper",
+    "multilangLabel": {},
+    "name": "Newspaper"
+  },
+  {
+    "name": "OfficialPublication",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#OfficialPublication"
+  },
+  {
+    "uri": "http://purl.org/ontology/bibo/Periodical",
+    "multilangLabel": {},
+    "name": "Periodical"
+  },
+  {
+    "multilangLabel": {},
+    "uri": "http://purl.org/ontology/bibo/Proceedings",
+    "name": "Proceedings"
+  },
+  {
+    "multilangLabel": {},
+    "name": "PublicationIssue",
+    "uri": "http://schema.org/PublicationIssue"
+  },
+  {
+    "name": "PublishedScore",
+    "multilangLabel": {},
+    "uri": "http://purl.org/ontology/mo/PublishedScore"
+  },
+  {
+    "name": "ReferenceSource",
+    "uri": "http://purl.org/ontology/bibo/ReferenceSource",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Report",
+    "uri": "http://purl.org/ontology/bibo/Report",
+    "multilangLabel": {}
+  },
+  {
+    "name": "Schoolbook",
+    "multilangLabel": {},
+    "uri": "http://purl.org/lobid/lv#Schoolbook"
+  },
+  {
+    "name": "Series",
+    "multilangLabel": {},
+    "uri": "http://purl.org/ontology/bibo/Series"
+  },
+  {
+    "name": "Standard",
+    "uri": "http://purl.org/ontology/bibo/Standard",
+    "label": "Standard",
+    "multilangLabel": {}
+  },
+  {
+    "multilangLabel": {},
+    "name": "Statistics",
+    "uri": "http://purl.org/lobid/lv#Statistics"
+  },
+  {
+    "name": "Thesis",
+    "multilangLabel": {},
+    "uri": "http://purl.org/ontology/bibo/Thesis"
   }
 ]