Introduce INPUT_DIR variable

pkiraly · May 29, 2024 · 29c19db · 29c19db
1 parent 0e84a35
commit 29c19db
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -338,7 +338,7 @@ library specific configuration file:
 |                   | `-c`/`--catalogue`  | display name of the catalogue                                      | `$NAME`                                                                                                                                                                                 |
 | `NAME`            | `-n`/`--name`       | name of the catalogue                                              | qa-catalogue                                                                                                                                                                            |
 | `BASE_INPUT_DIR`  | `-d`/`--input`      | parent directory of input file directories                         | `./input`                                                                                                                                                                               |
-|                   | `-d`/`--input-dir`  | subdirectory of input directory to read files from                 |                                                                                                                                                                                         |
+| `INPUT_DIR`       | `-d`/`--input-dir`  | subdirectory of input directory to read files from                 |                                                                                                                                                                                         |
 | `BASE_OUTPUT_DIR` | `-o`/`--output`     | parent output directory                                            | `./output`                                                                                                                                                                              |
 | `MASK`            | `-m`/`--mask`       | a file mask which input files to process, e.g. `*.mrc`             | `*`                                                                                                                                                                                     |
 | `TYPE_PARAMS`     | `-p`/`--params`     | parameters to pass to individual tasks (see below)                 |                                                                                                                                                                                         |

diff --git a/common-script b/common-script
@@ -570,6 +570,7 @@ fatal() {
 }
 
 # initialize environment, set default values
+# TODO: remove this because it's already done in ./qa-catalogue)
 NAME=${NAME:-$(basename $0 .sh)}
 BASE_INPUT_DIR=${BASE_INPUT_DIR:-./input}
 BASE_OUTPUT_DIR=${BASE_OUTPUT_DIR:-./output}

diff --git a/docker/qa-catalogue b/docker/qa-catalogue
@@ -36,6 +36,7 @@ if [ ${#args[@]} == 0 ]; then
   echo "variable CONTAINER). Try command 'help' for usage of QA catalogue!"
   echo "Environment variables are read from .env or file given with --env-file."
 else
+  set -x
   docker container exec \
     $docker_options \
     "$CONTAINER" \

diff --git a/qa-catalogue b/qa-catalogue
@@ -35,11 +35,11 @@ BASE_INPUT_DIR=${BASE_INPUT_DIR:-./input}
 BASE_OUTPUT_DIR=${BASE_OUTPUT_DIR:-./output}
 MASK=${MASK:-*}
 NAME=${NAME:-qa-catalogue}
+INPUT_DIR=${INPUT_DIR:-$NAME}
 TYPE_PARAMS=${TYPE_PARAMS:-}
 SCHEMA=${SCHEMA:-MARC21}
 WEB_CONFIG=${WEB_CONFIG:-}
 ENV_FILE=${ENV_FILE:-.env}
-MARC_DIR=${BASE_INPUT_DIR:-}
 
 # parse command line options
 options=$(getopt -o a:c:d:i:m:n:o:p:s:u:v:w:f: --long analyses:,catalogue:,input-dir:,input:,mask:,name:,output:,params:,schema:,update:,version:,web-config:,env-file: -- "$@")
@@ -50,7 +50,7 @@ while true; do
     case "$1" in
     -a|--analyses) ANALYSES=$2 ; shift ;;
     -c|--catalogue) CATALOGUE=$2 ; shift ;;
-    -d|--input-dir) MARC_DIR=${BASE_INPUT_DIR}/$2 ; shift ;;
+    -d|--input-dir) INPUT_DIR=$2 ; shift ;;
     -i|--input) BASE_INPUT_DIR=$2 ; shift ;;
     -m|--mask) MASK=$2 ; shift ;;
     -n|--name) NAME=$2 ; shift ;;
@@ -76,13 +76,16 @@ if [[ -f "$ENV_FILE" ]]; then
   source "$ENV_FILE"
 fi
 
+# this should not be set by hand
+MARC_DIR=$BASE_INPUT_DIR/$INPUT_DIR
+
 cat << EOF
 configuration:
 ---------------------------
 ANALYSES:                 ${ANALYSES:-}
 CATALOGUE:                ${CATALOGUE:-}
-MARC_DIR (input-dir):     ${MARC_DIR:-}
 BASE_INPUT_DIR (input):   ${BASE_INPUT_DIR}
+INPUT_DIR (input-dir):    ${INPUT_DIR:-}
 MASK:                     ${MASK}
 NAME:                     ${NAME}
 BASE_OUTPUT_DIR (output): ${BASE_OUTPUT_DIR}