Changeset 29064 for main

Timestamp:

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

Author:

kjdon

Message:

simplify code cos we are always only looking for OAIPMH servicerack. keep a reference to it once set it up.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/OAICollection.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/OAICollection.java

@@ -1 +1 @@
 /*
- *    Collection.java
+ *    OAICollection.java
  *    Copyright (C) 2002 New Zealand Digital Library, http://www.nzdl.org
  *
@@ -34 +34 @@
 import org.greenstone.gsdl3.core.ModuleInterface;
 import org.greenstone.gsdl3.service.ServiceRack;
+import org.greenstone.gsdl3.service.OAIPMH;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -51 +52 @@
  * only want to load the OAIPMH service rack, not any of the others
  * 
- * @author Katherine Don
- * @see ModuleInterface
  */
 public class OAICollection extends Collection
@@ -61 +60 @@
     /** does this collection provide the OAI service */
     protected boolean has_oai = false;
+
+  /** a reference to the OAIPMH service rack */
+  protected OAIPMH oai_service_rack = null;
 
     /**
@@ -112 +114 @@
     }
 
-
+  /** add any extra info for collection from OAIConfig.xml */
+  public boolean configureOAI(Element oai_config) {
+    // just pass the element to each service - should only be one
+    return this.oai_service_rack.configureOAI(oai_config);
+  }
 
   /** override this to only load up OAIPMH serviceRack  - don't need all the rest of them for oai*/
@@ -119 +125 @@
 
       // find the OAIPMH service
-      Element oai_service_xml = GSXML.getNamedElement(service_rack_list, GSXML.SERVICE_CLASS_ELEM, GSXML.NAME_ATT, OAIXML.OAI_SERVICE_RACK);
+      Element oai_service_xml = GSXML.getNamedElement(service_rack_list, GSXML.SERVICE_CLASS_ELEM, GSXML.NAME_ATT, "OAIPMH");
       if (oai_service_xml == null) {
         return false;
@@ -130 +136 @@
       message.appendChild(request);
 
-      ServiceRack s = null;
-      
-      try {
-        
-        // try for a default service in standard package
-        s = (ServiceRack) Class.forName("org.greenstone.gsdl3.service." + OAIXML.OAI_SERVICE_RACK).newInstance();
-        
-      } catch (Exception e) {}
-        
-      if (s == null) {
-        
-        try {
-          // name as is, in case package is already specified
-          s = (ServiceRack) Class.forName(OAIXML.OAI_SERVICE_RACK).newInstance();
-        } catch (Exception e) {}
-      }
-
-      if (s == null) {
-        
-        logger.error("Couldn't get an instance of class " + OAIXML.OAI_SERVICE_RACK + ", or org.greenstone.gsdl3.service." + OAIXML.OAI_SERVICE_RACK);
-        return false;
-      }
-
-
-      s.setSiteHome(this.site_home);
-      s.setSiteAddress(this.site_http_address);
-      s.setClusterName(this.cluster_name);
-      s.setServiceCluster(this);
-      s.setMessageRouter(this.router);
+      this.oai_service_rack = new OAIPMH();
+      this.oai_service_rack.setSiteHome(this.site_home);
+      this.oai_service_rack.setSiteAddress(this.site_http_address);
+      this.oai_service_rack.setClusterName(this.cluster_name);
+      this.oai_service_rack.setServiceCluster(this);
+      this.oai_service_rack.setMessageRouter(this.router);
       // pass the xml node to the service for configuration
-      if (s.configure(oai_service_xml, extra_info)) {
+      if (this.oai_service_rack.configure(oai_service_xml, extra_info)) {
         
         // find out the supported service types for this service module
-        Node types = s.process(message);
+        Node types = this.oai_service_rack.process(message);
         NodeList typenodes = ((Element) types).getElementsByTagName(GSXML.SERVICE_ELEM);
         
@@ -184 +167 @@
             ((Element) typenodes.item(j)).setAttribute(GSXML.NAME_ATT, service);
           }
-        this.service_map.put(service, s);
+        this.service_map.put(service, this.oai_service_rack);
         // also add info to the ServiceInfo XML element
         this.service_list.appendChild(this.desc_doc.importNode(typenodes.item(j), true));