Changeset 30975 for other-projects/hathitrust/solr-extracted-features/trunk/_RUN.bash

Timestamp:

2016-10-28T14:28:51+13:00 (7 years ago)

Author:

davidb

Message:

Introduction of new solr-url command line argument, leading to some other adjustments in RUN scripts

File:

• other-projects/hathitrust/solr-extracted-features/trunk/_RUN.bash (modified) (3 diffs)

other-projects/hathitrust/solr-extracted-features/trunk/_RUN.bash

@@ -19 +19 @@
 fi
 
-if [ "x$output_dir" = "x" ] ; then
-    echo "_RUN.bash: Failed to set 'output_dir'" 1>&2
-    exit
-fi
+#if [ "x$output_dir" = "x" ] ; then
+#    echo "_RUN.bash: Failed to set 'output_dir'" 1>&2
+#    exit
+#fi
 
 run_jps=0
@@ -71 +71 @@
     
 self_contained_jar=target/htrc-ef-ingest-0.9-jar-with-dependencies.jar
-base_cmd="spark-submit --class org.hathitrust.PrepareForIngest $master_opt $self_contained_jar"
+cmd="spark-submit --class org.hathitrust.PrepareForIngest $master_opt $self_contained_jar"
 
-cmd="$base_cmd --verbosity 1 $json_filelist $input_dir $output_dir $*"
+if [ "x$solr_url" != "x" ] ; then
+    cmd="$cmd --solr-url $solr_url"
+fi
+
+if [ "x$output_dir" != "x" ] ; then
+    cmd="$cmd --output-dir $output_dir"
+fi
+
+
+cmd="$cmd --verbosity 1 $input_dir $json_filelist $*"
 
 echo "****"
@@ -79 +88 @@
 echo "*   $cmd"
 echo "****"
+
 if [ "$run_jps" = "1" ] ; then
   echo "* Monitor progress on Spark cluster through:"