Introduce a better system to handle command line input

1 files changed, 18 insertions, 2 deletions

diff --git a/run_tests.bash b/run_tests.bash
index 17cbf01..92e0223 100755
--- a/run_tests.bash
+++ b/run_tests.bash
@@ -32,6 +32,8 @@ print_help() {
     echo "    -q | --queries <path>:"
     echo "        path to a folder containing SPARQL query files to be"
     echo "        executed against the ontology and data."
+    echo "    -j | --jar <path>:"
+    echo "        path to the fat jar to be executed."
     echo "    -p | --prefix <path>:"
     echo "        provides a folder to prefix to the output files."
     echo "        Defaults to './results'."
@@ -43,6 +45,7 @@ print_help() {
 ONTOLOGY=""
 DATA=""
 QUERIES=""
+JAR=""
 PREFIX="./results"
 
 while [[ $# -gt 0 ]]
@@ -72,6 +75,14 @@ do
                 print_help && \
                 exit 2
             ;;
+        -j|--jar)
+            shift
+            JAR="$1"
+            [ ! -r "$JAR" ] && \
+                msg_error "Unable to read jar '$JAR'" && \
+                print_help && \
+                exit 2
+            ;;
         -p|--prefix)
             shift
             PREFIX="$1"
@@ -104,12 +115,17 @@ done
     print_help && \
     exit 3
 
+[ -z "$JAR" ] && \
+    msg_error "Use -j | --jar to provide a jar file" && \
+    print_help && \
+    exit 3
 
 DATAS=`\ls $DATA/*`
 mkdir -p "$PREFIX"
-for QUERY in "$QUERIES"/*.sparql
+for QUERY in "$QUERIES"/query*.sparql
 do
-    sbt "run $QUERY $ONTOLOGY $DATAS" 2>&1 | tee "$PREFIX/answers_$(basename $QUERY .sparql).txt"
+    #sbt "run $QUERY $ONTOLOGY $DATAS" 2>&1 | tee "$PREFIX/answers_$(basename $QUERY .sparql).txt"
+    java -cp ./lib/JRDFox.jar:"$JAR" uk.ac.ox.cs.rsacomb.RSAComb -q "$QUERY" "$ONTOLOGY" "$DATA"/* 2>&1 | tee "$PREFIX/answers_$(basename $QUERY .sparql).txt"
 done
 
 OUTPUT="$PREFIX/results.csv"