Changeset 31024 for other-projects/hathitrust/wcsa/extracted-features-solr

Timestamp:

2016-11-02T11:37:07+13:00 (7 years ago)

Author:

davidb

Message:

Support for Java properties file

Location:

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest

Files:

• ef-solr.properties (added)
• src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package org.hathitrust.extractedfeatures;
 
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.Serializable;
 import org.apache.commons.cli.*;
@@ -178 +182 @@
         options.addOption(verbosity_opt);
         
+        Option properties_opt = new Option("p", "properties", false, 
+                "Read in the specified Java properties file.");
+        properties_opt.setRequired(false);
+        options.addOption(properties_opt);
+        
         Option output_dir_opt = new Option("o", "output-dir", true, 
                 "If specified, save BZipped Solr JSON files to this directory");
@@ -213 +222 @@
         int verbosity = Integer.parseInt(verbosity_str);
 
+        String property_filename = cmd.getOptionValue("properties",null);
+    
         String output_dir = cmd.getOptionValue("output-dir",null);
         String solr_url   = cmd.getOptionValue("solr-url",null);
@@ -222 +233 @@
             print_usage(formatter,options);
             System.exit(1);
+        }
+    
+        if (property_filename != null) {
+            try {
+                FileInputStream fis = new FileInputStream(property_filename);
+                BufferedInputStream bis = new BufferedInputStream(fis);
+                
+                System.getProperties().load(bis);
+            } 
+            catch (FileNotFoundException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                System.err.println("File not found: '" + property_filename + "'. Skipping property file read");
+            }
+            catch (IOException e) {
+                System.err.println("IO Exception for: '" + property_filename + "'. Malformed syntax? Skipping property file read");
+            }
         }