Release Data Preparation Tool 3.4.2.

Deutsche-Digitale-Bibliothek · Jun 1, 2021 · b4d2165 · b4d2165
1 parent f5237d5
commit b4d2165
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,9 @@ Data Preparation Tool Changes Log   (siehe für spezifische Änderungen: https:/
 
 Release-Übersicht:
 
+3.4.2, 01.06.2021:
+     Korrektur der EAD(DDB)-Validierung: <lb/> nun auch als Subelement erlaubt in physdesc, physdesc/extent, physdesc/dimensions, unitid, origination, origination/name, langmaterial/language und indexentry/* (Angleichung an XSD-Schema)
+
 3.4.1, 28.05.2021:
      Diverse Bugfixes und Verbesserungen.
      Fehlende Module hinzugefügt, damit der Source Code wieder direkt ausgeführt werden kann.

diff --git a/gui_session/version.xml b/gui_session/version.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mapping-library-version>
-    <version-number>3.4.1</version-number>
+    <version-number>3.4.2</version-number>
     <branch>stable</branch>
-    <revision>2adea789</revision>  <!-- Commit-Revision im Git-Repository -->
+    <revision>452fe9d4</revision>  <!-- Commit-Revision im Git-Repository -->
 </mapping-library-version>
diff --git a/modules/analysis/validation/rule_definitions/eadddb_findbuch.py b/modules/analysis/validation/rule_definitions/eadddb_findbuch.py
@@ -357,7 +357,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -1020,7 +1020,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["type"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1113,7 +1113,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}genreform", "{urn:isbn:1-931666-22-9}dimensions", "{urn:isbn:1-931666-22-9}extent"]
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}genreform", "{urn:isbn:1-931666-22-9}dimensions", "{urn:isbn:1-931666-22-9}extent", "{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1176,7 +1176,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1206,7 +1206,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1296,7 +1296,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["langcode", "scriptcode"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1396,7 +1396,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["label"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}name"]
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}name", "{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1426,7 +1426,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -1958,7 +1958,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -1996,7 +1996,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2034,7 +2034,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2071,7 +2071,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True

diff --git a/modules/analysis/validation/rule_definitions/eadddb_tektonik.py b/modules/analysis/validation/rule_definitions/eadddb_tektonik.py
@@ -1146,7 +1146,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["type"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1240,7 +1240,7 @@ def compile_validation_rules() -> dict:
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
     ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}genreform", "{urn:isbn:1-931666-22-9}dimensions",
-                                       "{urn:isbn:1-931666-22-9}extent"]
+                                       "{urn:isbn:1-931666-22-9}extent", "{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1303,7 +1303,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1333,7 +1333,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = []
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1423,7 +1423,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["langcode", "scriptcode"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1523,7 +1523,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["label"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}name"]
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}name", "{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = None
     ruleset["text_character_content_allowed"] = True
@@ -1553,7 +1553,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2092,7 +2092,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2130,7 +2130,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2168,7 +2168,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True
@@ -2205,7 +2205,7 @@ def compile_validation_rules() -> dict:
     ruleset["element_children_optional"] = True
     ruleset["optional_attributes"] = ["role", "source", "authfilenumber"]
     ruleset["obligatory_attributes"] = []
-    ruleset["optional_subelements"] = []
+    ruleset["optional_subelements"] = ["{urn:isbn:1-931666-22-9}lb"]
     ruleset["obligatory_subelements"] = []
     ruleset["max_occurence"] = 1
     ruleset["text_character_content_allowed"] = True