Changeset 5962

Timestamp:

2003-11-25T11:43:32+13:00 (20 years ago)

Author:

kjdon

Message:

uses class loader instead of gs3home ref

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java (modified) (1 diff)

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

@@ -5 +5 @@
 import org.xml.sax.EntityResolver;
 import java.io.File;
+import java.net.URL;
 
-// maybe use class loader to find dtds etc????
+// uses a class loader to find entities
 public class GSEntityResolver implements EntityResolver {
 
-    protected String gsdl3_home = "";
-
-    public GSEntityResolver(String gsdl3_home) {
-    this.gsdl3_home = gsdl3_home;
-    }
-    
+    //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);
+        
         }
+    } else if (system_id.endsWith(".dtd") && system_id.indexOf(File.separatorChar)==-1) {
         
-        // a local ref
-        system_id = GSFile.dtdDir(gsdl3_home)+File.separatorChar+system_id;
-        return new InputSource(system_id);
-    } else if (system_id.endsWith(".dtd") && system_id.indexOf(File.separatorChar)==-1) {
-        system_id = "file://"+GSFile.dtdDir(gsdl3_home)+File.separatorChar+system_id;
-        return new InputSource(system_id);
-        
-    } 
-    return null; // leave it up to teh thing itself
-        
+    } else {
+        return null;
+    }
+    System.out.println("using class loader for "+system_id);
+    URL url = ClassLoader.getSystemResource(system_id);
+    if (url == null) {
+        System.out.println("class loader didn't find it");
+        return null;
+    }
+    return new InputSource("file://"+url.getFile());
     }
 }