Changeset 31336

Timestamp:

2017-01-23T20:46:54+13:00 (7 years ago)

Author:

davidb

Message:

Changes in response to testing

File:

• other-projects/hathitrust/wcsa/vol-checker/src/org/hathitrust/extractedfeatures/VolumeCheck.java (modified) (1 diff)

other-projects/hathitrust/wcsa/vol-checker/src/org/hathitrust/extractedfeatures/VolumeCheck.java

@@ -72 +72 @@
         
         // 3. Finally add in the (safely transformed) id:
-        //   append directory that is 'id'
-        //   further append 'id'.json.bz
-        
-        
-        String id_safe = id.replaceAll("\\.", ",").replaceAll(":", "+").replaceAll("/", "=");
-        
-        int id_dot_pos = id_safe.indexOf(".");
-        String id_prefix = id_safe.substring(0,id_dot_pos);
-        String id_tail = id_safe.substring(id_dot_pos+1);
-        
-        String [] pairs = id_tail.split("(?<=\\G..)");
+        //   append directory that is prefix-removed id (transformed to be safe)
+        //   further append 'id-safe'.json.bz
+        
+        int id_dot_pos = id.indexOf(".");
+        String id_prefix = id.substring(0,id_dot_pos);
+        String id_tail = id.substring(id_dot_pos+1);
+        String id_tail_safe = id_tail.replaceAll("\\.", ",").replaceAll(":", "+").replaceAll("/", "=");
+        
+        String [] pairs = id_tail_safe.split("(?<=\\G..)");
         String joined_pairs = String.join("/", pairs);
 
+        String id_safe = id_prefix + "." + id_tail_safe;
         String main_dir = id_prefix + "/pairtree_root/" + joined_pairs;
-        String filename = main_dir + "/" + id_safe + "/" + id_safe + file_ext;
+        String filename = main_dir + "/" + id_tail_safe + "/" + id_safe + file_ext;
         
         return filename;