Changeset 16579

Timestamp:

2008-07-29T13:11:31+12:00 (16 years ago)

Author:

ak19

Message:

Modified to work with changes in doc.pm: doc.pm Base64 encodes gsdlsourcefilename now, so this class must decode it.

File:

• gli/trunk/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -32 +32 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.util.Utility;
-
+import org.greenstone.gatherer.feedback.Base64;
 
 /** This class represents one doc.xml file */
@@ -229 +229 @@
             boolean is_unix_path = gsdlsourcefilename_value.startsWith("/");
             gsdlsourcefilename_value = gsdlsourcefilename_value.substring(1);
+
+            // Apply Base64 decoding - note that encoding into base64 may have 
+            // encoded some characters as slashes. Since slash characters are 
+            // removed below the decoding must be done before that to ensure 
+            // only genuine slashes remain for processing:
+            gsdlsourcefilename_value = new String(Base64.decode(gsdlsourcefilename_value));
+            //System.err.println("****decodedSrcFilename is: " + gsdlsourcefilename_value);
 
             // Make sure the path matches the OS that is running