Merge branch 'master' into 1168-recreateAllHoldings

hbz · Apr 23, 2021 · 8eac272 · 8eac272
2 parents 07fce9b + cd2879b
commit 8eac272
Show file tree

Hide file tree

Showing 24 changed files with 1,378 additions and 144 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,12 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install metafacture-core snapshot
-      run: |
-        git clone https://github.com/metafacture/metafacture-core.git
-        cd metafacture-core
-        ./gradlew install
+      # uncomment when needed
+      #- name: Install metafacture-core snapshot
+      #run: |
+      #  git clone https://github.com/metafacture/metafacture-core.git
+      #  cd metafacture-core
+      #  ./gradlew install
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:

diff --git a/pom.xml b/pom.xml
@@ -16,72 +16,72 @@
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-io</artifactId>
-			<version>master-SNAPSHOT</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-json</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-biblio</artifactId>
-			<version>master-SNAPSHOT</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-formeta</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-monitoring</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-strings</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-formatting</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-triples</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-flowcontrol</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metamorph</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-plumbing</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metamorph-test</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-xml</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.metafacture</groupId>
 			<artifactId>metafacture-mangling</artifactId>
-			<version>5.1.0</version>
+			<version>5.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.jena</groupId>

diff --git a/src/main/resources/alma/common/fields.xml b/src/main/resources/alma/common/fields.xml
@@ -170,10 +170,6 @@
   </entity>
 	-->
   <call-macro name="regex-del-punctuation-end" dsource="245??.a" dname="@title" />
-  <data name="@title" source="245??.p">
-    <occurrence only="1" />
-    <replace pattern="\s?\.?\s?$" with="" />
-  </data>
   <data name="title" source="@title">
     <!-- Delete not sorting signs in title -->
     <replace pattern="&gt;" with=""/>
@@ -187,6 +183,13 @@
     </data>
   </entity>
 
+  <data name="titleOfSubSeries" source="245??.p">
+    <occurrence only="1" />
+    <replace pattern="\s?\.?\s?$" with="" />
+    <replace pattern="&gt;" with=""/>
+    <replace pattern="&lt;" with=""/>
+  </data>
+
   <!--
   <entity name="VolumeDesignation">
     <data name="volumeDesignation" source="245??.n">

diff --git a/src/main/resources/alma/common/subjects.xml b/src/main/resources/alma/common/subjects.xml
@@ -60,14 +60,18 @@
     <!-- 689 RSWK Schlagwortfolgen fka: Schlagwortketten 1 - 10 -->
     <!-- 1 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68900">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data name="" source="68900">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6890?">
-          <data name="type" source="6890?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6890?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6890?.a" />
           <data name="id" source="6890?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -88,14 +92,18 @@
     </entity>
     <!-- 2 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68910">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68910">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6891?">
-          <data name="type" source="6891?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6891?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6891?.a" />
           <data name="id" source="6891?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -116,14 +124,18 @@
     </entity>
     <!-- 3 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68920">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68920">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6892?">
-          <data name="type" source="6892?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6892?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6892?.a" />
           <data name="id" source="6892?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -144,14 +156,18 @@
     </entity>
     <!-- 4 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68930">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68930">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6893?">
-          <data name="type" source="6893?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6893?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6893?.a" />
           <data name="id" source="6893?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -172,14 +188,18 @@
     </entity>
     <!-- 5 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68940">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68940">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6894?">
-          <data name="type" source="6894?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6894?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6894?.a" />
           <data name="id" source="6894?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -200,14 +220,18 @@
     </entity>
     <!-- 6 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68950">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68950">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6895?">
-          <data name="type" source="6895?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">        
+            <data source="6895?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6895?.a" />
           <data name="id" source="6895?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -228,14 +252,18 @@
     </entity>
     <!-- 7 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68960">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68960">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6896?">
-          <data name="type" source="6896?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6896?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6896?.a" />
           <data name="id" source="6896?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -256,14 +284,18 @@
     </entity>
     <!-- 8 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68970">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68970">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6897?">
-          <data name="type" source="6897?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6897?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6897?.a" />
           <data name="id" source="6897?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -284,14 +316,18 @@
     </entity>
     <!-- 9 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68980">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68980">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6898?">
-          <data name="type" source="6898?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6898?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6898?.a" />
           <data name="id" source="6898?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>
@@ -312,14 +348,18 @@
     </entity>
     <!-- 10 -->
     <entity name="" flushWith="record">
-      <data name="type" source="68990">
-        <constant value="ComplexSubject"/>
-      </data>
+      <entity name="type[]" sameEntity="true" reset="true">
+        <data source="68990">
+          <constant value="ComplexSubject"/>
+        </data>
+      </entity>
       <entity name="componentList[]" flushWith="record">
         <entity name="" sameEntity="true" reset="true" flushWith="6899?">
-          <data name="type" source="6899?.D">
-            <lookup in="rswk-indicator" />
-          </data>
+          <entity name="type[]" sameEntity="true" reset="true">
+            <data source="6899?.D">
+              <lookup in="rswk-indicator" />
+            </data>
+          </entity>
           <data name="label" source="6899?.a" />
           <data name="id" source="6899?.0">
             <regexp match="\(DE-588\)(.*)" format="http://d-nb.info/gnd/${1}"/>

diff --git a/src/test/resources/alma/(CKB)2560000000104439.json b/src/test/resources/alma/(CKB)2560000000104439.json
@@ -129,7 +129,7 @@
     },
     "resultOf" : {
       "type" : [ "CreateAction" ],
-      "endTime" : "2021-04-22T13:50:21",
+      "endTime" : "2021-04-23T15:35:12",
       "instrument" : {
         "id" : "https://github.com/hbz/lobid-resources",
         "type" : [ "SoftwareApplication" ],