Changeset 31451 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java

Timestamp:

2017-03-02T23:28:38+13:00 (7 years ago)

Author:

davidb

Message:

shift to using solr-base-url and a specified solr-collection

File:

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

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

@@ -32 +32 @@
     protected String _langmap_directory;
     
-    protected String _solr_url;
+    protected final ArrayList<String> _solr_endpoints;
+    protected final int _solr_endpoints_len;
+    
+    //protected String _solr_url;
     protected String _output_dir;
     
@@ -44 +47 @@
 
     public PerVolumeJSON(String input_dir, String whitelist_filename, String langmap_directory,
-                         String solr_url, String output_dir, int verbosity, 
+                         ArrayList<String> solr_endpoints, String output_dir, int verbosity, 
                          boolean icu_tokenize, boolean strict_file_io)
     {
@@ -53 +56 @@
         _langmap_directory = langmap_directory;
         
-        _solr_url   = solr_url;
+        _solr_endpoints = solr_endpoints;
+        _solr_endpoints_len = solr_endpoints.size();
+        
+        //_solr_url   = solr_url;
         _output_dir = output_dir;
         _verbosity  = verbosity;
@@ -77 +83 @@
         int ef_num_pages = 0;
 
+        String solr_url = null;
+        if (_solr_endpoints_len > 0) {
+            int random_choice = (int)(_solr_endpoints_len * Math.random());
+            solr_url = _solr_endpoints.get(random_choice);
+        }
+        
         try {
 
@@ -125 +137 @@
 
 
-                        if (_solr_url != null) {
+                        if (solr_url != null) {
                             if ((_verbosity >=2) && (i==20)) {
                                 System.out.println("==================");
-                                System.out.println("Posting to: " + _solr_url);
+                                System.out.println("Posting to: " + solr_url);
                                 System.out.println("==================");
                             }
-                            SolrDocJSON.postSolrDoc(_solr_url, solr_add_doc_json);
+                            SolrDocJSON.postSolrDoc(solr_url, solr_add_doc_json);
                         }