Changeset 30918 for other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PrepareForIngest.java

Timestamp:

2016-10-25T14:49:36+13:00 (8 years ago)

Author:

davidb

Message:

More flexible command-line args

File:

• other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PrepareForIngest.java (modified) (4 diffs)

other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PrepareForIngest.java

@@ -35 +35 @@
 */
 
-    //protected int _num_cores;
-    protected String _input_dir;
-    protected String _json_list_filename;
+    //protected int _num_cores;
+    protected String _input_dir;
+    protected String _json_list_filename;
     protected String _output_dir;
     
@@ -44 +44 @@
         //_num_cores = num_cores;
         _input_dir = input_dir;
-        _json_list_filename = json_list_filename;
+        _json_list_filename = (json_list_filename != null) ? json_list_filename : input_dir;
         _output_dir = output_dir;
     }
@@ -115 +115 @@
 
         //cmd.hasOption("json-filelist")
-        String json_list_filename = cmd.getOptionValue("json-filelist","pd-file-listing.txt");
+        String json_list_filename = cmd.getOptionValue("json-filelist");
         //int num_cores = Integer.parseInt(num_cores_str);
 
@@ -126 +126 @@
         
         if (filtered_args.length != 2) {
-            System.err.println("Usage: RUN.bat [options] input-dir output-dir");
+                System.err.println("Usage: RUN.bat [options] input-dir output-dir");
+            formatter.printHelp("utility-name", options);
+
+            //System.err.println("Usage: RUN.bat [options] input-dir output-dir");
             //System.err.println("  Where 'filename.txt' contains a list of JSON files, one per line,");
             //System.err.println("  which use the HathiTrust Extracted Feature JSON format");