Merge branch 'master' into gds-hash-id

CHANGELOG.md

@@ -5,6 +5,25 @@ Versioned according to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [2.4.4] - 2020-03-17
+
+Fixed:
+
+  * #437 broke simple types in PAGE model, (really) revert 3a0a3a8, #451
+
+## [2.4.3] - 2020-03-12
+
+Fixed:
+
+  * bashlib: ocrd-tool.json-related errors no longer lead to silent exit, #456
+  * #437 broke simple types in PAGE model, revert 3a0a3a8, #451
+
+## [2.4.2] - 2020-02-20
+
+Fixed:
+
+  * JSON strings longer than OS-allowed filename size crash fixed, #444
+
 ## [2.4.1] - 2020-02-19
 
 Changed:
@@ -757,6 +776,9 @@ Fixed
 Initial Release
 
 <!-- link-labels -->
+[2.4.4]: ../../compare/v2.4.4...v2.4.3
+[2.4.3]: ../../compare/v2.4.3...v2.4.2
+[2.4.2]: ../../compare/v2.4.2...v2.4.1
 [2.4.1]: ../../compare/v2.4.1...v2.4.0
 [2.4.0]: ../../compare/v2.4.0...v2.3.1
 [2.3.1]: ../../compare/v2.3.1...v2.3.0

ocrd/bashlib/src/parse_argv.bash

@@ -57,13 +57,11 @@ ocrd__parse_argv () {
 
 
     local params_parsed retval
-    params_parsed="$(ocrd ocrd-tool "$OCRD_TOOL_JSON" tool $OCRD_TOOL_NAME parse-params -p "${ocrd__argv[parameter]:-{\}}")"
-    retval=$?
-    if [[ $retval != 0 ]];then
-        echo "Error: Failed to parse parameters (retval $retval):"
-        echo "$params_parsed"
-        exit 42 # $retval
-    fi
+    params_parsed="$(ocrd ocrd-tool "$OCRD_TOOL_JSON" tool $OCRD_TOOL_NAME parse-params -p "${ocrd__argv[parameter]:-{\}}")" || {
+        retval=$?
+        ocrd__raise "Failed to parse parameters (retval $retval):
+$params_parsed"
+    }
     eval "$params_parsed"
 
 }

ocrd/ocrd/lib.bash

@@ -96,13 +96,11 @@ ocrd__parse_argv () {
 
 
     local params_parsed retval
-    params_parsed="$(ocrd ocrd-tool "$OCRD_TOOL_JSON" tool $OCRD_TOOL_NAME parse-params -p "${ocrd__argv[parameter]:-{\}}")"
-    retval=$?
-    if [[ $retval != 0 ]];then
-        echo "Error: Failed to parse parameters (retval $retval):"
-        echo "$params_parsed"
-        exit 42 # $retval
-    fi
+    params_parsed="$(ocrd ocrd-tool "$OCRD_TOOL_JSON" tool $OCRD_TOOL_NAME parse-params -p "${ocrd__argv[parameter]:-{\}}")" || {
+        retval=$?
+        ocrd__raise "Failed to parse parameters (retval $retval):
+$params_parsed"
+    }
     eval "$params_parsed"
 
 }

ocrd_models/ocrd_models/ocrd_page.py

@@ -67,7 +67,7 @@ def to_xml(el):
     """
     sio = StringIO()
     el.export(sio, 0, name_='PcGts',
-            namespacedef_='xmlns="%s" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="%s %s/pagecontent.xsd"' % (
+            namespacedef_='xmlns:pc="%s"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="%s %s/pagecontent.xsd"' % (
                 NAMESPACES['page'],
                 NAMESPACES['page'],
                 NAMESPACES['page']