Changeset 29752

Timestamp:

2015-02-19T16:37:12+13:00 (9 years ago)

Author:

ak19

Message:

Related to commits 29687, 29729, 29730. The changes to incorporating the new servlets.xml in web.xml requires additional processing for windows.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java

@@ -19 +19 @@
 package org.greenstone.gsdl3.util;
 
+import org.greenstone.util.Misc;
 
 import org.xml.sax.InputSource;
@@ -71 +72 @@
     // use the baseFilepath, if one was provided
     if(this.baseFilepath != null) {
-        return new InputSource("file://" + this.baseFilepath + File.separator + temp_id);
+    
+        // The file protocol for windows starts with file:/// and has URL slashes
+        // http://en.wikipedia.org/wiki/File_URI_scheme#Windows
+        String newpath = this.baseFilepath + File.separator + temp_id;      
+        if(Misc.isWindows()) {          
+            newpath = "file:///" + newpath.replace("\\", "/");
+            System.err.println("### entity resolver for "+"file:///" + newpath);            
+        } else { // linux version, file protocol starts with file:// and slashes are already URL-style
+            newpath = "file://" + newpath;
+        }
+        return new InputSource(newpath);
     }