Changeset 33744 for main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

Timestamp:

2019-12-03T15:04:32+13:00 (4 years ago)

Author:

ak19

Message:

Refactored code to do more inside functions rather than make callers do extra, specific work that requires knowledge of what happened (and didn't happen) inside the called functions. Shifted the new functions about until they appear after Dr Bainbridge's more important functions.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

@@ -668 +668 @@
         }
         
-        String curr_directory_path = FilenameEncoding.filenameToURLEncoding(".");
-        curr_directory_path = curr_directory_path.substring(0, curr_directory_path.length()-2); // cut off /. at end
-        //System.err.println("@@@ curr_directory_path: " + curr_directory_path);
+        String curr_directory_path = FilenameEncoding.fullFilepathToURLEncoding(".");
+        
+        //String curr_directory_path = FilenameEncoding.filenameToURLEncoding(".");
+        //curr_directory_path = curr_directory_path.substring(0, curr_directory_path.length()-2); // cut off /. at end
+        System.err.println("@@@ curr_directory_path: " + curr_directory_path);
         
         //System.err.println("PARSED loaded_file contains:\n" +  XMLTools.elementToString(doc.getDocumentElement(), true));
@@ -687 +689 @@
                     // Reencode filename after parseXML() had the side-effect of decoding entities in filename elements
                     
-                    //System.err.println("Filename before reencoding was: " + filename);                    
+                    System.err.println("Filename before reencoding was: " + filename);                  
                     
                     // Can't convert to URI with backslash-escaped chars (backslash used in regexed filename are illegal in URI object
                     // created by filenameToURLEncoding). So replace backslashes in regex with url-encoded hex-value of backslash, %5C.
                     String encoded_filename = filename.replace("\\", "%5C"); 
+                    
+                    /*
                     encoded_filename = FilenameEncoding.filenameToURLEncoding(encoded_filename);
-
                     // now lop off the metadataxml dir prefix the FilenameEncoding.filenameToURLEncoding(STRING) variant would have added
                     encoded_filename = encoded_filename.substring(curr_directory_path.length());
@@ -699 +702 @@
                         encoded_filename = encoded_filename.substring(FilenameEncoding.URL_FILE_SEPARATOR.length());
                     }
-    
+                    */
+                    
+                    // get the URL encoded filename preserving special encodings, with any curr_directory_path prefix removed
+                    encoded_filename = FilenameEncoding.filenameToURLEncodingWithPrefixRemoved(encoded_filename, curr_directory_path);
+                    
                     // Reintrodudce the backslash characters in place of their %5C hex placeholders
                     encoded_filename = encoded_filename.replace("%5C", "\\");               
@@ -705 +712 @@
                     // Update filename element in DOM
                     XMLTools.setElementTextValue(filename_element, encoded_filename);
-                    //System.err.println("Filename after reencoding was: " + encoded_filename);
+                    System.err.println("Filename after reencoding was: " + encoded_filename);
                 }
             }