From ccc34fc8590340c6fb72d4d9c884746090b7fbf8 Mon Sep 17 00:00:00 2001
From: TobiasNx <tobias.buelte@hbz-nrw.de>
Date: Tue, 18 May 2021 16:08:16 +0200
Subject: [PATCH] Erratic choose construct in entity See
 https://github.com/metafacture/metafacture-core/issues/366

---
 src/main/resources/alma/common/subjects.xml   | 22 ++++++++++++++-----
 .../resources/alma/(DE-605)HT003176544.json   | 12 ++--------
 .../resources/alma/(DE-605)HT019246898.json   |  2 +-
 .../resources/alma/(DE-605)HT020202475.json   |  6 ++---
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/alma/common/subjects.xml b/src/main/resources/alma/common/subjects.xml
index 2f8e08c4d8..e5f0ddb90e 100644
--- a/src/main/resources/alma/common/subjects.xml
+++ b/src/main/resources/alma/common/subjects.xml
@@ -4,9 +4,14 @@
     <!-- 610 CorporateBody -->
     <entity name="" flushWith="610??" sameEntity="true" reset="true">
       <entity name="type[]" sameEntity="true" reset="true">
-        <data source="610??.a">
-          <constant value="Concept"/>
-        </data>
+        <choose sameEntity="true" reset="true" flushWith="610??.a">
+          <data source="610?0.a">
+            <constant value="Concept"/>
+          </data>
+          <data source="610?4.a">
+            <constant value="Keyword"/>
+          </data>
+        </choose>
       </entity>
       <entity name="source" sameEntity="true" reset="true" flushWith="610??">
         <data source="610?0.a" name="label">
@@ -28,9 +33,14 @@
     <!-- 650 Topical Term -->
     <entity name="" flushWith="650??" sameEntity="true" reset="true">
       <entity name="type[]" sameEntity="true" reset="true">
-        <data source="650??.a">
-          <constant value="Concept"/>
-        </data>
+        <choose sameEntity="true" reset="true" flushWith="650??.a">
+          <data source="650?0.a">
+            <constant value="Concept"/>
+          </data>
+          <data source="650?4.a">
+            <constant value="Keyword"/>
+          </data>
+        </choose>
       </entity>
       <entity name="source" sameEntity="true" reset="true" flushWith="650??">
         <data source="650?0.a" name="label">
diff --git a/src/test/resources/alma/(DE-605)HT003176544.json b/src/test/resources/alma/(DE-605)HT003176544.json
index 00143fa426..9a0efdab7c 100644
--- a/src/test/resources/alma/(DE-605)HT003176544.json
+++ b/src/test/resources/alma/(DE-605)HT003176544.json
@@ -72,7 +72,7 @@
     },
     "resultOf" : {
       "type" : [ "CreateAction" ],
-      "endTime" : "2021-05-05T13:50:10",
+      "endTime" : "2021-05-18T15:59:07",
       "instrument" : {
         "id" : "https://github.com/hbz/lobid-resources",
         "type" : [ "SoftwareApplication" ],
@@ -94,63 +94,55 @@
     } ]
   },
   "subject" : [ {
-    "type" : [ "Concept" ],
     "label" : "Berlin",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Bremen",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Hamburg",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Nordrhein-Westfalen",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Niedersachsen",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Rheinland-Pfalz",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Saarland",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
     "label" : "Schleswig-Holstein",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
+    "type" : [ "Keyword" ],
     "label" : "Hotel- und Gaststättengewerbe",
     "source" : {
       "label" : "Freie Verschlagwortung",
diff --git a/src/test/resources/alma/(DE-605)HT019246898.json b/src/test/resources/alma/(DE-605)HT019246898.json
index 9fa6d34550..de61816c46 100644
--- a/src/test/resources/alma/(DE-605)HT019246898.json
+++ b/src/test/resources/alma/(DE-605)HT019246898.json
@@ -323,7 +323,7 @@
     },
     "resultOf" : {
       "type" : [ "CreateAction" ],
-      "endTime" : "2021-05-03T16:15:52",
+      "endTime" : "2021-05-18T15:59:08",
       "instrument" : {
         "id" : "https://github.com/hbz/lobid-resources",
         "type" : [ "SoftwareApplication" ],
diff --git a/src/test/resources/alma/(DE-605)HT020202475.json b/src/test/resources/alma/(DE-605)HT020202475.json
index 6e8ee5a5b8..b141e5e594 100644
--- a/src/test/resources/alma/(DE-605)HT020202475.json
+++ b/src/test/resources/alma/(DE-605)HT020202475.json
@@ -93,7 +93,7 @@
     },
     "resultOf" : {
       "type" : [ "CreateAction" ],
-      "endTime" : "2021-04-30T10:28:50",
+      "endTime" : "2021-05-18T15:59:08",
       "instrument" : {
         "id" : "https://github.com/hbz/lobid-resources",
         "type" : [ "SoftwareApplication" ],
@@ -115,14 +115,14 @@
     } ]
   },
   "subject" : [ {
-    "type" : [ "Concept" ],
+    "type" : [ "Keyword" ],
     "label" : "Critical theory",
     "source" : {
       "label" : "Freie Verschlagwortung",
       "id" : "https://www.wikidata.org/wiki/Q47524318"
     }
   }, {
-    "type" : [ "Concept" ],
+    "type" : [ "Keyword" ],
     "label" : "Electronic books",
     "source" : {
       "label" : "Freie Verschlagwortung",