Changeset 30979 for other-projects

Timestamp:

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

Author:

davidb

Message:

_solr_url needs to be stored in class!

Location:

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

Files:

• PagedJSON.java (modified) (1 diff)
• PrepareForIngest.java (modified) (2 diffs)

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

@@ -191 +191 @@
     {
         // "http://10.11.0.53:8983/solr/"
-        String post_url = "http://10.11.0.53:8983/solr/htrc-pd-ef/update";
-            
+        //String post_url = "http://10.11.0.53:8983/solr/htrc-pd-ef/update";
+        String post_url = _solr_url;
+        
         //String curl_popen = "curl -X POST -H 'Content-Type: application/json'";
         //curl_popen += " 'http://10.11.0.53:8983/solr/htrc-pd-ef/update'";

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

@@ -25 +25 @@
         _input_dir = input_dir;
         _json_list_filename = (json_list_filename != null) ? json_list_filename : input_dir;
+
+        _solr_url   = solr_url;
         _output_dir = output_dir;
-        _verbosity = verbosity;
+        _verbosity  = verbosity;
     }
 
@@ -44 +46 @@
         JavaRDD<String> json_list_data = jsc.textFile(_json_list_filename,NUM_PARTITIONS).cache();
 
-        PagedJSON paged_json = new PagedJSON(_input_dir,_solr_url, _output_dir,_verbosity);
+        PagedJSON paged_json = new PagedJSON(_input_dir, _solr_url,_output_dir,_verbosity);
         JavaRDD<String> json_ids = json_list_data.flatMap(paged_json).cache();