Changeset 31007 for other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures

Timestamp:

2016-10-31T09:35:06+13:00 (7 years ago)

Author:

davidb

Message:

Class name refactoring

Location:

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

Files:

• BasePerJSON.java (deleted)
• JSONSolrTransform.java (deleted)
• PagedJSON.java (deleted)
• PagedJSONForeach.java (deleted)
• PerPageJSONFlatmap.java (added)
• PerPageJSONForeach.java (added)
• PerVolumeJSON.java (modified) (3 diffs)
• ProcessForSolrIngest.java (modified) (2 diffs)
• SolrDocJSON.java (added)

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

@@ -99 +99 @@
             if (ef_page != null) {
                 // Convert to Solr add form
-                JSONObject solr_add_doc_json = JSONSolrTransform.generateSolrDocJSON(volume_id, page_id, ef_page);
+                JSONObject solr_add_doc_json = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_page);
 
             
@@ -115 +115 @@
                         System.out.println("==================");
                     }
-                    JSONSolrTransform.postSolrDoc(_solr_url, solr_add_doc_json);
+                    SolrDocJSON.postSolrDoc(_solr_url, solr_add_doc_json);
                 }
 
@@ -124 +124 @@
                         System.out.println("==================");
                     }
-                    JSONSolrTransform.saveSolrDoc(solr_add_doc_json, _output_dir + "/" + output_json_bz2);
+                    SolrDocJSON.saveSolrDoc(solr_add_doc_json, _output_dir + "/" + output_json_bz2);
                 }
             }

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

@@ -6 +6 @@
 import org.apache.spark.api.java.*;
 import org.apache.spark.util.DoubleAccumulator;
-import org.hathitrust.extractedfeatures.PagedJSON;
+import org.hathitrust.extractedfeatures.PerPageJSONFlatmap;
 import org.json.JSONObject;
 import org.apache.spark.SparkConf;
@@ -105 +105 @@
         DoubleAccumulator progress_accum = jsc.sc().doubleAccumulator("Progress Percent");
         
-        PagedJSON paged_json = new PagedJSON(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
+        PerPageJSONFlatmap paged_json = new PerPageJSONFlatmap(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
         JavaRDD<JSONObject> json_per_page_ids = json_list_data.flatMap(paged_json).cache();
         
-        PagedJSONForeach paged_json_foreach = new PagedJSONForeach(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
+        PerPageJSONForeach paged_json_foreach = new PerPageJSONForeach(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
         json_per_page_ids.foreach(paged_json_foreach);