Merge branch 'issue/45' into 'master'

Issue #45: Fix insert scripts for travel allowances and workers

See merge request !13

scripts/travel_allowances/insert_travel_allowances.sh

@@ -27,12 +27,9 @@ if [ -z ${host+x} ]; then
     echo "Var 'host' is unset. Set it in file 'scripts/travel_allowance/config.sh'.";
     exit;
 fi
-if [ -z ${filter+x} ]; then
-    echo "Var 'filter' is unset. Set it in file 'scripts/travel_allowance/config.sh'.";
-    exit;
-fi
-if [ -z ${university+x} ]; then
-    echo "Var 'university' is unset. Set it in file 'scripts/travel_allowance/config.sh'.";
+size=${#filter[@]}
+if [ "$size" -lt 1 ]; then
+    echo "Var 'filter' is unset. Set it in file 'scripts/expenses/config.sh'.";
     exit;
 fi
 
@@ -75,7 +72,6 @@ do
     # Step 2:
     ./create_travel_allowance_config.py $1 $2 "$day" "$index" "$host" "$key" $3 $4
     # Step 3:
-    echo "${filter[$i]}"
     ./resume_travel_allowance.sh "$path" ${1}-${2} "${filter[$key]}"
     # Step 4:
     logstash -f ../../configs/travel_allowance/logstash/config-${1}-${2} < ${path}processed/${1}${2}.csv

scripts/workers/insert_register_payment.sh

@@ -32,12 +32,9 @@ if [ -z ${host+x} ]; then
     echo "Var 'host' is unset. Set it in file 'scripts/workers/config.sh'.";
     exit;
 fi
-if [ -z ${filter+x} ]; then
-    echo "Var 'filter' is unset. Set it in file 'scripts/workers/config.sh'.";
-    exit;
-fi
-if [ -z ${university+x} ]; then
-    echo "Var 'university' is unset. Set it in file 'scripts/workers/config.sh'.";
+size=${#filter[@]}
+if [ "$size" -lt 1 ]; then
+    echo "Var 'filter' is unset. Set it in file 'scripts/expenses/config.sh'.";
     exit;
 fi