Changeset 33969

Timestamp:

2020-02-25T13:39:10+13:00 (4 years ago)

Author:

kjdon

Message:

we no longer use OAIConfig.xml as the filename, now we use eg oaiserver-OAIConfig.xml, so that we can have 2 OAI servers if necessary. eg serving different sites. so pass in the server name

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java (modified) (2 diffs)

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

@@ -217 +217 @@
    *  the oai_version and baseURL variables are also set in here. 
    *  The init() method is also called in here. */ 
-  public static Element getOAIConfigXML() {
+  public static Element getOAIConfigXML(String servlet_url_name) {
      
     File oai_config_file = null;
 
+    String config_filename = servlet_url_name+"-OAIConfig.xml";
     try {
-      URL oai_config_url = Class.forName("org.greenstone.gsdl3.OAIServer").getClassLoader().getResource("OAIConfig.xml");
+      URL oai_config_url = Class.forName("org.greenstone.gsdl3.OAIServer").getClassLoader().getResource(config_filename);
       if (oai_config_url == null) {
-    logger.error("couldn't find OAIConfig.xml via class loader");
+    logger.error("couldn't find "+config_filename+" via class loader");
     return null;
       }
@@ -233 +234 @@
       }
     } catch(Exception e) {
-      logger.error("couldn't find OAIConfig.xml "+e.getMessage());
+      logger.error("couldn't find "+config_filename+" "+e.getMessage());
       return null;
     }