Changeset 29753

Timestamp:

2015-02-19T16:46:29+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 when GLI launches requires additional processing for windows too, similar to the change for launching the GS3 server, which was part of the previous commit 29752.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/util/GLIEntityResolver.java (modified) (1 diff)
• greenstone3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/GLIEntityResolver.java

@@ -149 +149 @@
             
             if(searchFile.exists()) {
-            DebugStream.println("\t Found " + searchFile.getAbsolutePath());
-            return new InputSource("file://" + searchFile.getAbsolutePath());
+                DebugStream.println("\t Found " + searchFile.getAbsolutePath());                
+            
+                String newpath = searchFile.getAbsolutePath();      
+                if(Utility.isWindows()) {           
+                    newpath = "file:///" + newpath.replace("\\", "/");
+                } else { // linux version, file protocol starts with file:// and slashes are already URL-style
+                    newpath = "file://" + newpath;
+                }
+                return new InputSource(newpath);
+                
             }
         }

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

@@ -77 +77 @@
         String newpath = this.baseFilepath + File.separator + temp_id;      
         if(Misc.isWindows()) {          
-            newpath = "file:///" + newpath.replace("\\", "/");
-            System.err.println("### entity resolver for "+"file:///" + newpath);            
+            newpath = "file:///" + newpath.replace("\\", "/");          
         } else { // linux version, file protocol starts with file:// and slashes are already URL-style
             newpath = "file://" + newpath;