Changeset 8081 for trunk/gsdl3/src/java/org/greenstone/gsdl3

Timestamp:

2004-08-26T17:12:42+12:00 (20 years ago)

Author:

kjdon

Message:

filenames from urls can contain %20 instead of spaces, so need to convert them back

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• SOAPServer.java.in (modified) (1 diff)
• SOAPServerLocalsite.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/SOAPServer.java.in

@@ -79 +79 @@
 
     private String readInFile(URL url) {
-    
+    String file_name = url.getFile();
+    // any spaces are encoded as %20
+    file_name = file_name.replaceAll("%20", " ");
     try {
-        BufferedReader reader = new BufferedReader(new FileReader(url.getFile()));
+        BufferedReader reader = new BufferedReader(new FileReader(file_name));
         String line = reader.readLine();
         line = line.trim();
         return line;
     } catch (Exception e) {
-        System.err.println("Exception occurred when reading in the file "+url.getFile()+": "+e);
+        System.err.println("Exception occurred when reading in the file "+file_name+": "+e);
     }
     return null;

trunk/gsdl3/src/java/org/greenstone/gsdl3/SOAPServerLocalsite.java

@@ -79 +79 @@
 
     private String readInFile(URL url) {
-    
+    String file_name = url.getFile();
+    // any spaces are encoded as %20
+    file_name = file_name.replaceAll("%20", " ");
     try {
-        BufferedReader reader = new BufferedReader(new FileReader(url.getFile()));
+        BufferedReader reader = new BufferedReader(new FileReader(file_name));
         String line = reader.readLine();
         line = line.trim();
         return line;
     } catch (Exception e) {
-        System.err.println("Exception occurred when reading in the file "+url.getFile()+": "+e);
+        System.err.println("Exception occurred when reading in the file "+file_name+": "+e);
     }
     return null;