Merge branch 'bashlib-param-parsing'

OCR-D · Jun 18, 2018 · 3495456 · 3495456
2 parents 0e14d05 + c4c0633
commit 3495456
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/bashlib/src/parse_argv.bash b/bashlib/src/parse_argv.bash
@@ -8,7 +8,11 @@
 ocrd__parse_argv () {
 
     if ! declare -p "argv" >/dev/null 2>/dev/null ;then
-        ocrd__raise "Must set \$argv"
+        ocrd__raise "Must set \$argv (declare -A argv)"
+    fi
+
+    if ! declare -p "params" >/dev/null 2>/dev/null ;then
+        ocrd__raise "Must set \$params (declare -A params)"
     fi
 
 
@@ -44,5 +48,8 @@ ocrd__parse_argv () {
     if [[ "${argv[output_file_grp]}" = "" ]];then
         argv[output_file_grp]="OCR-D-TEXT"
     fi
+
+    eval `ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" parse-params -p "${argv[parameter]}"`
+
 }
 
diff --git a/ocrd/lib.bash b/ocrd/lib.bash
@@ -62,7 +62,11 @@ Options:
 ocrd__parse_argv () {
 
     if ! declare -p "argv" >/dev/null 2>/dev/null ;then
-        ocrd__raise "Must set \$argv"
+        ocrd__raise "Must set \$argv (declare -A argv)"
+    fi
+
+    if ! declare -p "params" >/dev/null 2>/dev/null ;then
+        ocrd__raise "Must set \$params (declare -A params)"
     fi
 
 
@@ -98,6 +102,9 @@ ocrd__parse_argv () {
     if [[ "${argv[output_file_grp]}" = "" ]];then
         argv[output_file_grp]="OCR-D-TEXT"
     fi
+
+    eval `ocrd ocrd-tool "$OCRD_TOOL_JSON" tool "$OCRD_TOOL_NAME" parse-params -p "${argv[parameter]}"`
+
 }
 
 # END-INCLUDE