Changeset 31675 for other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java

Timestamp:

2017-05-11T22:19:06+12:00 (7 years ago)

Author:

davidb

Message:

More careful set of metadata fields indexed

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/PerVolumeJSON.java (modified) (1 diff)

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

@@ -134 +134 @@
                     }
                 }
-/*              
+                
                 //
                 // Now move on to POS extracted features per-page
                 //
-                JSONObject ef_features = extracted_feature_record.getJSONObject("features");
-
-                int ef_page_count = ef_features.getInt("pageCount");
-
-                if (_verbosity >= 1) {
-                    System.out.println("Processing: " + volume_id);
-                    System.out.println("  pageCount = " + ef_page_count);
-                }
-
-                JSONArray ef_pages = ef_features.getJSONArray("pages");
-                ef_num_pages = ef_pages.length();
-
-
-                for (int i = 0; i < ef_page_count; i++) {
-                    String formatted_i = String.format("page-%06d", i);
-                    String page_id = volume_id + "." + formatted_i;
-
-                    if (_verbosity >= 2) {
-                        System.out.println("  Page: " + page_id);
-                    }
-
-
-                    JSONObject ef_page = ef_pages.getJSONObject(i);
-
-                    if (ef_page != null) {
-                        // Convert to Solr add form
-                        JSONObject solr_add_doc_json 
-                        = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_page, _whitelist_bloomfilter, _universal_langmap, _icu_tokenize);
-
-
-                        if ((_verbosity >=2) && (i==20)) {
-                            System.out.println("==================");
-                            System.out.println("Sample output Solr add JSON [page 20]: " + solr_add_doc_json.toString());
-                            System.out.println("==================");
-                        }
-
-
-                        if (solr_url != null) {
-                            SolrDocJSON.postSolrDoc(solr_url, solr_add_doc_json,
+                boolean index_pages = true;
+                if (index_pages) {
+                    
+                    JSONObject ef_features = extracted_feature_record.getJSONObject("features");
+
+                    int ef_page_count = ef_features.getInt("pageCount");
+
+                    if (_verbosity >= 1) {
+                        System.out.println("Processing: " + volume_id);
+                        System.out.println("  pageCount = " + ef_page_count);
+                    }
+
+                    JSONArray ef_pages = ef_features.getJSONArray("pages");
+                    ef_num_pages = ef_pages.length();
+
+
+                    for (int i = 0; i < ef_page_count; i++) {
+                        String formatted_i = String.format("page-%06d", i);
+                        String page_id = volume_id + "." + formatted_i;
+
+                        if (_verbosity >= 2) {
+                            System.out.println("  Page: " + page_id);
+                        }
+
+
+                        JSONObject ef_page = ef_pages.getJSONObject(i);
+
+                        if (ef_page != null) {
+                            // Convert to Solr add form
+                            JSONObject solr_add_doc_json 
+                            = SolrDocJSON.generateSolrDocJSON(volume_id, page_id, ef_page, _whitelist_bloomfilter, _universal_langmap, _icu_tokenize);
+
+
+                            if ((_verbosity >=2) && (i==20)) {
+                                System.out.println("==================");
+                                System.out.println("Sample output Solr add JSON [page 20]: " + solr_add_doc_json.toString());
+                                System.out.println("==================");
+                            }
+
+
+                            if (solr_url != null) {
+                                SolrDocJSON.postSolrDoc(solr_url, solr_add_doc_json,
                                         volume_id, page_id);
-                        }
-                    }
-                    else {
-                        System.err.println("Skipping: " + page_id);
-                    }
-
-                }
-                */
+                            }
+                        }
+                        else {
+                            System.err.println("Skipping: " + page_id);
+                        }
+
+                    }
+                }
             }
         }