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

Timestamp:

2015-03-19T13:53:24+13:00 (9 years ago)

Author:

ak19

Message:

some more changes to make adding metadata to filenames with non latin1 characters work. previously, any char above 127 was being output as %XX. this doesn't work as higher values can end up like %101. but when you decode you only ever look for 2 digits after the %. so higher values we'll use entities like ā then had to modify the xml writing to not escape the text in hte filename element - otherwise get ā

File:

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

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

@@ -45 +45 @@
     static final private String FILESET_ELEMENT = "FileSet";
     static final private String METADATA_ELEMENT = "Metadata";
-
+    static final private String[] nonEscapingElements = new String[]{FILENAME_ELEMENT};
+    
     /** Special metadata field: the filename encoding is a unique sort of metadata in
      * that it is not just information stored with a collection file, but also needs to
@@ -123 +124 @@
     // If no appropriate FileSet element exists create a new one for this file
     if (appropriate_fileset_element == null) {
-        DebugStream.println("Creating new FileSet element for file since none exists...");
+        DebugStream.println("Creating new FileSet element for file since none exists..."+file_path_regexp);
         appropriate_fileset_element = loaded_file_document.createElement(FILESET_ELEMENT);
 
@@ -605 +606 @@
     // If we have a file loaded into memory and it has been modified, save it now
     if (loaded_file != null && loaded_file_changed == true) {
-        XMLTools.writeXMLFile(loaded_file, loaded_file_document);
+        XMLTools.writeXMLFile(loaded_file, loaded_file_document, nonEscapingElements);
+    
+        
         loaded_file_changed = false;
     }