Changeset 31786

Timestamp:

2017-07-08T21:04:06+12:00 (6 years ago)

Author:

davidb

Message:

extra param in call; change to case-folding _htrctokentext

Location:

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

Files:

• PerPageJSONFlatmap.java (modified) (2 diffs)
• SolrDocJSON.java (modified) (2 diffs)

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

@@ -131 +131 @@
                 }
 
+                JSONObject ef_metadata = extracted_feature_record.getJSONObject("metadata");
                 JSONObject ef_page = ef_pages.getJSONObject(i);
 
@@ -136 +137 @@
                     // Convert to Solr add form
                     JSONObject solr_add_doc_json 
-                        = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_page, 
+                        = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_metadata, ef_page, 
                                                     _whitelist_bloomfilter, _universal_langmap,
                                                     _icu_tokenize);

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

@@ -596 +596 @@
                                 pos_lang_text_field += "_" + upos; 
                             }
-                            pos_lang_text_field += "_htrctoken";
+                            pos_lang_text_field += "_htrctokentext";
                             
                             if (!pos_lang_text_field_map.containsKey(pos_lang_text_field)) {
@@ -617 +617 @@
                 }
                 else {
-                    String lang_text_field = lang_key + "_htrctoken";
+                    String lang_text_field = lang_key + "_htrctokentext";
                     
                     JSONArray json_values = new JSONArray();