Changeset 33971

Timestamp:

2020-02-25T13:47:12+13:00 (4 years ago)

Author:

kjdon

Message:

get servlet_url param and pass to getOAIConfigXML, as now the files are named with the servlet name - so you can have more than one oai servlet running

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -108 +108 @@
         super.init(config);
         this.default_lang = config.getInitParameter(GSConstants.DEFAULT_LANG);
+        String servlet_url_name=config.getInitParameter("servlet_url");
 
         initVerbs();
@@ -137 +138 @@
         }
 
+
+        // Read in OAIConfig-xxx.xml (residing web/WEB-INF/classes/) and 
+        //use it to configure the receptionist. And pass it to MR 
+        Element oai_config = OAIXML.getOAIConfigXML(servlet_url_name);
+        if (oai_config == null)
+        {
+            logger.error("Fail to parse oai config file OAIConfig-"+servlet_url_name+".xml");
+            throw new UnavailableException("OAIServer: Couldn't parse OAIConfig-"+servlet_url_name+".xml");
+        }
+        
         // the receptionist -the servlet will talk to this
         this.recept = new OAIReceptionist();
@@ -165 +176 @@
             message_router.setSiteName(site_name);
             // lots of work is done in this step; see OAIMessageRouter.java
+            message_router.setOAIConfig(oai_config);
             if (!message_router.configure()) {
               throw new UnavailableException("OAIServer: Couldn't configure OAIMessageRouter");
@@ -200 +212 @@
             this.recept.setSiteName(remote_site_name);
             this.recept.setMessageRouter(communicator);
-        }
-
-        // Read in OAIConfig.xml (residing web/WEB-INF/classes/) and 
-        //use it to configure the receptionist. 
-        Element oai_config = OAIXML.getOAIConfigXML();
-        if (oai_config == null)
-        {
-            logger.error("Fail to parse oai config file OAIConfig.xml.");
-            throw new UnavailableException("OAIServer: Couldn't parse OAIConfig.xml");
         }
         // pass it to the receptionist