Changeset 31007


Ignore:
Timestamp:
2016-10-31T09:35:06+13:00 (6 years ago)
Author:
davidb
Message:

Class name refactoring

Location:
other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures
Files:
3 added
4 deleted
2 edited

Legend:

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

    r31005 r31007  
    9999            if (ef_page != null) {
    100100                // Convert to Solr add form
    101                 JSONObject solr_add_doc_json = JSONSolrTransform.generateSolrDocJSON(volume_id, page_id, ef_page);
     101                JSONObject solr_add_doc_json = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_page);
    102102
    103103           
     
    115115                        System.out.println("==================");
    116116                    }
    117                     JSONSolrTransform.postSolrDoc(_solr_url, solr_add_doc_json);
     117                    SolrDocJSON.postSolrDoc(_solr_url, solr_add_doc_json);
    118118                }
    119119
     
    124124                        System.out.println("==================");
    125125                    }
    126                     JSONSolrTransform.saveSolrDoc(solr_add_doc_json, _output_dir + "/" + output_json_bz2);
     126                    SolrDocJSON.saveSolrDoc(solr_add_doc_json, _output_dir + "/" + output_json_bz2);
    127127                }
    128128            }
  • other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

    r31006 r31007  
    66import org.apache.spark.api.java.*;
    77import org.apache.spark.util.DoubleAccumulator;
    8 import org.hathitrust.extractedfeatures.PagedJSON;
     8import org.hathitrust.extractedfeatures.PerPageJSONFlatmap;
    99import org.json.JSONObject;
    1010import org.apache.spark.SparkConf;
     
    105105        DoubleAccumulator progress_accum = jsc.sc().doubleAccumulator("Progress Percent");
    106106       
    107         PagedJSON paged_json = new PagedJSON(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
     107        PerPageJSONFlatmap paged_json = new PerPageJSONFlatmap(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
    108108        JavaRDD<JSONObject> json_per_page_ids = json_list_data.flatMap(paged_json).cache();
    109109       
    110         PagedJSONForeach paged_json_foreach = new PagedJSONForeach(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
     110        PerPageJSONForeach paged_json_foreach = new PerPageJSONForeach(_input_dir,_solr_url,_output_dir,_verbosity, progress_accum,per_vol);
    111111        json_per_page_ids.foreach(paged_json_foreach);
    112112
Note: See TracChangeset for help on using the changeset viewer.