Changeset 31096 for other-projects/hathitrust/wcsa/extracted-features-solr

Timestamp:

2016-11-10T19:25:14+13:00 (7 years ago)

Author:

davidb

Message:

Only need to create a volume's pages output directory is _output_dir has been specified

Location:

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

Files:

• PerPageJSONFlatmap.java (modified) (1 diff)
• PerVolumeJSON.java (modified) (1 diff)

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

@@ -86 +86 @@
             String json_dir = ClusterFileIO.removeSuffix(json_file_in,".json.bz2");
             String page_json_dir = json_dir + "/pages";
-            ClusterFileIO.createDirectoryAll(_output_dir + "/" + page_json_dir);
 
+            if (_output_dir != null) {
+                // Only need to do this once per volume, so easier to here than in the per-page Map
+                ClusterFileIO.createDirectoryAll(_output_dir + "/" + page_json_dir);
+            }
             if (_verbosity >= 2) {
                 System.out.print("  Pages: ");

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

@@ -65 +65 @@
         String json_dir = ClusterFileIO.removeSuffix(json_file_in,".json.bz2");
         String page_json_dir = json_dir + "/pages";
-        ClusterFileIO.createDirectoryAll(_output_dir + "/" + page_json_dir);
+        
+        if (_output_dir != null) {
+            ClusterFileIO.createDirectoryAll(_output_dir + "/" + page_json_dir);
+        }
         
         //ArrayList<String> ids = new ArrayList<String>(ef_num_pages);