Changeset 21771 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

Timestamp:

2010-03-08T16:17:11+13:00 (14 years ago)

Author:

kjdon

Message:

pass build_config_xml as the extra info for a servicerack coming from coll config

File:

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

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

@@ -40 +40 @@
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
- * @version $Revision$
  * @see ModuleInterface
  */
@@ -238 +237 @@
     clearServices();
     Element service_list = (Element)GSXML.getChildByTagName(build_config_xml, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
-    configureServiceRack(service_list, coll_config_xml);
-    
-    // Check for oai
-    Element oai_service_rack = GSXML.getNamedElement(service_list, GSXML.SERVICE_CLASS_ELEM, OAIXML.NAME, OAIXML.OAIPMH);
-    if (oai_service_rack == null) {
-      has_oai = false;
-      logger.info("No oai for collection: " + this.cluster_name);
-      
-    } else {
-      has_oai = true;
-    }
-    
+    configureServiceRackList(service_list, coll_config_xml);
+        
     // collection Config may also contain manually added service racks
     service_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
     if (service_list != null) {
-      configureServiceRack(service_list, coll_config_xml);
+      configureServiceRackList(service_list, build_config_xml);
+      
+      // Check for oai
+      Element oai_service_rack = GSXML.getNamedElement(service_list, GSXML.SERVICE_CLASS_ELEM, OAIXML.NAME, OAIXML.OAIPMH);
+      if (oai_service_rack == null) {
+    has_oai = false;
+    logger.info("No oai for collection: " + this.cluster_name);
+    
+      } else {
+    has_oai = true;
+      }
     }
     return true;