Changeset 16579

Show
Ignore:
Timestamp:
29.07.2008 13:11:31 (11 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/metadata/DocXMLFile.java

    r12041 r16579  
    3232import org.greenstone.gatherer.DebugStream; 
    3333import org.greenstone.gatherer.util.Utility; 
    34  
     34import org.greenstone.gatherer.feedback.Base64; 
    3535 
    3636/** This class represents one doc.xml file */ 
     
    229229            boolean is_unix_path = gsdlsourcefilename_value.startsWith("/"); 
    230230            gsdlsourcefilename_value = gsdlsourcefilename_value.substring(1); 
     231 
     232            // Apply Base64 decoding - note that encoding into base64 may have  
     233            // encoded some characters as slashes. Since slash characters are  
     234            // removed below the decoding must be done before that to ensure  
     235            // only genuine slashes remain for processing: 
     236            gsdlsourcefilename_value = new String(Base64.decode(gsdlsourcefilename_value)); 
     237            //System.err.println("****decodedSrcFilename is: " + gsdlsourcefilename_value); 
    231238 
    232239            // Make sure the path matches the OS that is running