Changeset 31374 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest

Timestamp:

2017-01-31T00:22:39+13:00 (7 years ago)

Author:

davidb

Message:

simplified command line usage

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java (modified) (6 diffs)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

@@ -34 +34 @@
     
     protected String _input_dir;
-    protected String _json_list_filename;
+    //protected String _json_list_filename;
     protected String _whitelist_filename;
     protected String _solr_url;
@@ -41 +41 @@
     protected int    _verbosity;
 
-    public ProcessForSolrIngest(String input_dir, String json_list_filename, 
+    public ProcessForSolrIngest(String input_dir, /*String json_list_filename,*/ 
                                 String solr_url, String output_dir, int verbosity)
     {
         _input_dir = input_dir;
-        _json_list_filename = (json_list_filename != null) ? json_list_filename : input_dir;
+        //_json_list_filename = (json_list_filename != null) ? json_list_filename : input_dir;
 
         boolean use_whitelist = Boolean.getBoolean("wcsa-ef-ingest.use-whitelist");
@@ -58 +58 @@
     {
         String spark_app_name = "[" + exec_mode + "] Extract Features: Process for Solr Ingest";
-        spark_app_name += " [" + _json_list_filename + "]";
+        //spark_app_name += " [" + _json_list_filename + "]";
 
         if (_solr_url != null) { 
@@ -101 +101 @@
 
         //String packed_sequence_path = "hdfs:///user/capitanu/data/packed-ef";
-        String packed_sequence_path = _json_list_filename;
+        String packed_sequence_path = _input_dir;
         
         JavaPairRDD<Text, Text> input_pair_rdd = jsc.sequenceFile(packed_sequence_path, Text.class, Text.class);
@@ -309 +309 @@
         String[] filtered_args = cmd.getArgs();
 
-        if (filtered_args.length != 2) {
+        if (filtered_args.length != 1) {
             print_usage(formatter,options);
             System.exit(1);
@@ -343 +343 @@
         
         String input_dir  = filtered_args[0];
-        String json_list_filename = filtered_args[1];
+        //String json_list_filename = filtered_args[1];
         
         ProcessForSolrIngest prep_for_ingest 
-            = new ProcessForSolrIngest(input_dir,json_list_filename,solr_url,output_dir,verbosity);
+            = new ProcessForSolrIngest(input_dir,/*json_list_filename,*/solr_url,output_dir,verbosity);
             
         prep_for_ingest.execPerVolumeSequenceFile();