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

Timestamp:

2015-02-10T18:07:10+13:00 (9 years ago)

Author:

ak19

Message:

Adjusting gs3-server code to work with changes made to 29686 where web.xml was split into web.xml and servlets.xml, with the first including the second.

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

@@ -33 +33 @@
 
     ClassLoader class_loader = null;
+    File baseFilepath = null;
     
      static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.GSEntityResolver.class.getName());
+
+    public GSEntityResolver() {}
+
+    public GSEntityResolver(File baseFilepath) {
+    this.baseFilepath = baseFilepath;
+    }
+
+    /* Methods with the ClassLoader parameter are unused at present */
+    public GSEntityResolver(ClassLoader loader) {
+    this.class_loader = loader;
+    }
 
     public void setClassLoader(ClassLoader loader) {
@@ -56 +68 @@
         }
     }
+    
+    // use the baseFilepath, if one was provided
+    if(this.baseFilepath != null) {
+        return new InputSource("file://" + this.baseFilepath + File.separator + temp_id);
+    }
+
     // try using a class loader
     if (this.class_loader==null) {