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

Timestamp:

2019-12-03T17:31:17+13:00 (4 years ago)

Author:

ak19

Message:

1. Bugfix for dealing with + in filenames: file-level metadata now sticks and also ends up in doc.xml on build, as should happen. 2. Better (more optimal) bugfix for & in filenames, to get metadata to still stick after yesterday's first bugfix for this. Sadly, the improved code no longer needs the new function I introduced yesterday (escapeAllCharWithHexEntity). Leaving the function in, in case it ever comes in handy or as an idea. 3. Refactoring some code. 4. Removed some debugging statements. But some things are still largely commented out. Will remove hereafter.

File:

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

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

@@ -668 +668 @@
         }
         
-        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);
+        String curr_directory_path = FilenameEncoding.fullFilepathToURLEncoding("."); // returns the curr dir path after removing the /./ at end        
+        //System.err.println("@@@ curr_directory_path: " + curr_directory_path);
         
         //System.err.println("PARSED loaded_file contains:\n" +  XMLTools.elementToString(doc.getDocumentElement(), true));
@@ -689 +686 @@
                     // 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());
-                    if (encoded_filename.startsWith(FilenameEncoding.URL_FILE_SEPARATOR)) {
-                        encoded_filename = encoded_filename.substring(FilenameEncoding.URL_FILE_SEPARATOR.length());
-                    }
-                    */
+                    String encoded_filename = filename.replace("\\", "%5C");
                     
                     // get the URL encoded filename preserving special encodings, with any curr_directory_path prefix removed
@@ -708 +696 @@
                     
                     // Reintrodudce the backslash characters in place of their %5C hex placeholders
-                    encoded_filename = encoded_filename.replace("%5C", "\\");               
+                    encoded_filename = encoded_filename.replace("%5C", "\\");
                     
                     // 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);
                 }
             }