Changeset 30974 for other-projects

Timestamp:

2016-10-28T13:47:10+13:00 (7 years ago)

Author:

davidb

Message:

update/add/doc JSON structure needed

File:

• other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/PagedJSON.java (modified) (4 diffs)

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

@@ -91 +91 @@
     protected JSONObject generateSolrDocJSON(String volume_id, String page_id, JSONObject ef_page) 
     {
-        JSONObject solr_add_json = null;
+        JSONObject solr_update_json = null;
         
         if (ef_page != null) {
@@ -99 +99 @@
                 if (ef_token_pos_count != null) {
 
-                    solr_add_json = new JSONObject();
+                    JSONObject solr_add_json = new JSONObject();
 
                     String text = generateSolrText(ef_token_pos_count);
-        
-                    
                     
                     JSONObject solr_doc_json = new JSONObject();
@@ -109 +107 @@
                     solr_doc_json.put("volumeid_s", volume_id);
                     solr_doc_json.put("_text_", text);
-                    solr_doc_json.put("commitWithin", 5000);
                    
-                    solr_add_json.put("add", solr_doc_json);
+                    solr_add_json.put("commitWithin", 5000);
+                    solr_add_json.put("doc", solr_doc_json);
+                    
+                    solr_update_json = new JSONObject();
+                    solr_update_json.put("add",solr_add_json);
+                    
                 }
                 else {
@@ -169 +171 @@
         
         //return solr_doc_json;
-        return solr_add_json;
+        return solr_update_json;
     }