Changeset 33968

Timestamp:

2020-02-25T13:37:20+13:00 (4 years ago)

Author:

kjdon

Message:

pass in oai_config from server, rather than reading it in itself

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIMessageRouter.java

@@ -65 +65 @@
     }
 
+    /** this must be called before calling configure() */
+    public void setOAIConfig(Element config) {
+    this.oai_config = config;
+    }
+    
     /**
      * read thru own site config file - create services and connect to sites
@@ -92 +97 @@
         this.config_info = config_doc.getDocumentElement();
 
-        // this is the receptionists OAIConfig.xml. Need to rethink how the MR gets this this if we ever talk to remote site, and whether it should be using it anyway
-        this.oai_config = OAIXML.getOAIConfigXML();
-        if (this.oai_config == null)
-        {
-          logger.error("Couldn't load in OAIConfig.xml");
-          return false;
-        }
         Document doc = XMLConverter.newDOM();
         // load up the collections