Changeset 31225 for other-projects/hathitrust/wcsa/extracted-features-solr
- Timestamp:
- 2016-12-13T13:46:23+13:00 (7 years ago)
- Location:
- other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerPageJSONFlatmap.java
r31221 r31225 25 25 26 26 protected String _input_dir; 27 protected String _whitelist_filename; 28 29 protected String _solr_url; 30 protected String _output_dir; 31 32 protected int _verbosity; 27 33 28 34 protected WhitelistBloomFilter _whitelist_bloomfilter; 29 35 30 protected String _solr_url;31 protected String _output_dir;32 protected int _verbosity;33 36 34 37 protected DoubleAccumulator _progress_accum; … … 43 46 { 44 47 _input_dir = input_dir; 45 46 if (whitelist_filename != null) { 47 _whitelist_bloomfilter = new WhitelistBloomFilter(whitelist_filename,true); 48 } 48 _whitelist_filename = whitelist_filename; 49 49 50 50 _solr_url = solr_url; … … 56 56 57 57 _strict_file_io = strict_file_io; 58 59 _whitelist_bloomfilter = null; 58 60 } 59 61 … … 61 63 public Iterator<JSONObject> call(String json_file_in) throws IOException 62 64 { 65 if ((_whitelist_filename != null) && (_whitelist_bloomfilter != null)) { 66 _whitelist_bloomfilter = new WhitelistBloomFilter(_whitelist_filename,true); 67 } 68 63 69 String full_json_file_in = _input_dir + "/" + json_file_in; 64 70 JSONObject extracted_feature_record = JSONClusterFileIO.readJSONFile(full_json_file_in); -
other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java
r31221 r31225 20 20 private static final long serialVersionUID = 1L; 21 21 protected String _input_dir; 22 23 protected WhitelistBloomFilter _whitelist_bloomfilter; 24 22 protected String _whitelist_filename; 23 25 24 protected String _solr_url; 26 25 protected String _output_dir; 26 27 27 protected int _verbosity; 28 29 protected WhitelistBloomFilter _whitelist_bloomfilter; 28 30 29 31 protected DoubleAccumulator _progress_accum; … … 35 37 { 36 38 _input_dir = input_dir; 37 38 if (whitelist_filename != null) { 39 _whitelist_bloomfilter = new WhitelistBloomFilter(whitelist_filename,true); 40 } 39 _whitelist_filename = whitelist_filename; 41 40 42 41 _solr_url = solr_url; … … 46 45 _progress_accum = progress_accum; 47 46 _progress_step = progress_step; 47 48 _whitelist_bloomfilter = null; 48 49 } 49 50 … … 51 52 public void call(String json_file_in) 52 53 { 54 if ((_whitelist_filename != null) && (_whitelist_bloomfilter != null)) { 55 _whitelist_bloomfilter = new WhitelistBloomFilter(_whitelist_filename,true); 56 } 57 53 58 JSONObject extracted_feature_record = JSONClusterFileIO.readJSONFile(_input_dir + "/" + json_file_in); 54 59
Note:
See TracChangeset
for help on using the changeset viewer.