Changeset 5979

Timestamp:

2003-11-25T16:08:35+13:00 (20 years ago)

Author:

kjdon

Message:

changed this completely

File:

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

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

@@ -10 +10 @@
 public class GSEntityResolver implements EntityResolver {
 
-    //public GSEntityResolver() {
-    ///ystem.out.println("creating entity resolver");
-    //}
     public InputSource resolveEntity (String public_id, String system_id) {
     
     System.out.println("entity resolver for "+system_id);
-    if (system_id.endsWith(".dtd") && system_id.indexOf("jakarta")!=-1) {
-        int index = system_id.lastIndexOf(File.separatorChar);
-        if (index != -1) {
-        system_id = system_id.substring(index+1);
-        
+    String temp_id = system_id;
+    if (temp_id.startsWith("file://")) {
+        File f = new File(system_id);
+        if (f.exists()) {
+        return new InputSource(system_id);
+        } else {
+        temp_id = temp_id.substring(temp_id.lastIndexOf(File.separator)+1);
         }
-    } else if (system_id.endsWith(".dtd") && system_id.indexOf(File.separatorChar)==-1) {
-        
     } else {
-        return null;
+        if (temp_id.indexOf(File.separatorChar)!= -1) {
+        temp_id = temp_id.substring(temp_id.lastIndexOf(File.separator)+1);
+        }
     }
-    System.out.println("using class loader for "+system_id);
-    URL url = ClassLoader.getSystemResource(system_id);
+    
+    System.out.println("using class loader for "+temp_id);
+    URL url = ClassLoader.getSystemResource(temp_id);
     if (url == null) {
         System.out.println("class loader didn't find it");
@@ -35 +35 @@
     return new InputSource("file://"+url.getFile());
     }
+
 }