Changeset 29065 for main

Timestamp:

2014-05-19T13:23:56+12:00 (10 years ago)

Author:

kjdon

Message:

configure the collection with the OAIConfig xml. this breaks the split between receptionist and MR as mostly this is used by receptionist.

File:

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

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

@@ -55 +55 @@
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.core.MessageRouter.class.getName());
 
-
+  public Element oai_config = null;
     //***************************************************************
     // public methods
@@ -74 +74 @@
         cleanUpModuleMapEntire();
 
+        // for oai, we don't do anything with the site config file. But we'll read it in and keep it in case need it later, eg for replace elements when retrieving metadata - which I don't think has been implemented
         File configFile = new File(GSFile.siteConfigFile(this.site_home));
 
@@ -91 +92 @@
         this.config_info = config_doc.getDocumentElement();
 
-        // for oai, we don't do anything with the config file. But we'll keep it in case need it later, eg for replace elements when retrieving metadata - which I don't think has been implemented
-
+        // 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
@@ -131 +137 @@
         if (!c.hasOAI()) {
           logger.info ("collection "+col_name+" has no OAI services. Not keeping it loaded");
+          return false;
+        }
+        if (!c.configureOAI(this.oai_config)) {
+          logger.info("couldn't configure the collection : "+col_name +" with the oai config info");
           return false;
         }