Changeset 16671 for gli/trunk

Timestamp:

2008-08-07T13:49:22+12:00 (16 years ago)

Author:

ak19

Message:

Instead of Base64 decoding the gsdl_source_filename it now URL decodes. This works with the doc.pm perl script which URLencodes gsdl_source_filename rather than applying base64 encoding on it (which is done to preserve the original character encoding).

File:

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

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

@@ -30 +30 @@
 import java.io.*;
 import java.util.*;
+import java.net.URLDecoder;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.util.Utility;
-import org.greenstone.gatherer.feedback.Base64;
+
 
 /** This class represents one doc.xml file */
@@ -230 +231 @@
             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);
+            // URL decode gsdlsourcefilename. Need to set the decoder to use the default system encoding
+            // This is stored in the System's file.encoding property.
+            gsdlsourcefilename_value = URLDecoder.decode(gsdlsourcefilename_value, System.getProperty("file.encoding")); 
 
             // Make sure the path matches the OS that is running