Changeset 33749

Timestamp:

2019-12-04T15:58:47+13:00 (4 years ago)

Author:

ak19

Message:

Still on the bugfix for GLI with non-ascii filenames assigned file-level metadata. Also needed to add the Linux fix for the case of replacing and removing metadata.

File:

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

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

@@ -296 +296 @@
         // so need to make sure everything hex has been decoded (no more hex) to compare apples with apples     
         if (hexdecoded_regexed_file_relative_path.matches(hexdecoded_current_filename_element_value)) { //if (file_relative_path.matches(current_filename_element_value)) {
-            //System.err.println("   @@@ Found a match in meta.xml for hexdecoded_regexed_file_relative_path: " + hexdecoded_regexed_file_relative_path + "\n");
+                //System.err.println("   @@@ Found a match in meta.xml for hexdecoded_regexed_file_relative_path: " + hexdecoded_regexed_file_relative_path + "\n");
             current_fileset_matches = true;
             if (!file_relative_path.equals("") && current_filename_element_value.equals(DIRECTORY_FILENAME)) {
@@ -414 +414 @@
     // Determine the file's path relative to the location of the metadata.xml file
     String metadata_xml_file_directory_path = FilenameEncoding.fileToURLEncoding(getParentFile());
-    String file_relative_path = file_node.getURLEncodedFilePath().substring(metadata_xml_file_directory_path.length());
+    String file_relative_path = file_node.getURLEncodedFilePath();
+    if(!FilenameEncoding.MULTIPLE_FILENAME_ENCODINGS_SUPPORTED) {
+        file_relative_path = file_relative_path.replace("&", FilenameEncoding.HEX_ENTITY_AMPERSAND);
+    }
+    file_relative_path = file_relative_path.substring(metadata_xml_file_directory_path.length());
     if (file_relative_path.startsWith(FilenameEncoding.URL_FILE_SEPARATOR)) {
         file_relative_path = file_relative_path.substring(FilenameEncoding.URL_FILE_SEPARATOR.length());
@@ -533 +537 @@
     // Determine the file's path relative to the location of the metadata.xml file
     String metadata_xml_file_directory_path = FilenameEncoding.fileToURLEncoding(getParentFile());
-    String file_relative_path = file_node.getURLEncodedFilePath().substring(metadata_xml_file_directory_path.length());
+    String file_relative_path = file_node.getURLEncodedFilePath();
+    if(!FilenameEncoding.MULTIPLE_FILENAME_ENCODINGS_SUPPORTED) {
+        file_relative_path = file_relative_path.replace("&", FilenameEncoding.HEX_ENTITY_AMPERSAND);
+    }
+    file_relative_path = file_relative_path.substring(metadata_xml_file_directory_path.length());   
     if (file_relative_path.startsWith(FilenameEncoding.URL_FILE_SEPARATOR)) {
         file_relative_path = file_relative_path.substring(FilenameEncoding.URL_FILE_SEPARATOR.length());