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

Timestamp:

2009-12-09T15:28:39+13:00 (14 years ago)

Author:

kjdon

Message:

a little bit of code rearranging and editing so that we can have a serviceRackList in collectionConfig.xml (as well as buildConfig.xml) - may want to manually specify one and not have to edit the file each time after a rebuild

File:

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

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

@@ -61 +61 @@
      *  the OAIPMH serviceRack 
      */
-    protected Element service_rack_list = null;
+    //protected Element service_rack_list = null;
     
     protected XMLTransformer transformer = null;
@@ -108 +108 @@
     findAndLoadInfo(coll_config_xml, build_config_xml);
     
-    // now do the services  
-    Element service_list = (Element)GSXML.getChildByTagName(build_config_xml, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
-    configureServiceRack(service_list, coll_config_xml);
-
-    this.service_rack_list = service_list;
-  
+    // now do the services
+    configureServiceRacks(coll_config_xml, build_config_xml);
+
     return true;
     
@@ -133 +130 @@
      */
     public boolean hasOAI() {
-      if (service_rack_list == null) return false;  
-      Element oai_service_rack = GSXML.getNamedElement(service_rack_list, GSXML.SERVICE_CLASS_ELEM,
-                            OAIXML.NAME, OAIXML.OAIPMH);
-      if (oai_service_rack == null) {
-        logger.info("No oai for collection: " + this.cluster_name);
-        return false;
-      }
-      return true;//oai_service_rack == null;
+      return has_oai;
     }
     /** 
@@ -179 +169 @@
     }
   
-  lastmodified = build_config_file.lastModified();
+    lastmodified = build_config_file.lastModified();
   
     return build_config_elem;
@@ -244 +234 @@
     }
 
-    protected boolean resolveMacros(Element display_list) {
+  protected boolean configureServiceRacks(Element coll_config_xml, 
+                      Element build_config_xml){
+    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;
+    }
+    
+    // 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);
+    }
+    return true;
+  }
+  
+  protected boolean resolveMacros(Element display_list) {
     if (display_list==null) return false;
     NodeList displaynodes = display_list.getElementsByTagName(GSXML.DISPLAY_TEXT_ELEM);
@@ -269 +283 @@
     Element build_config_elem = loadBuildConfigFile();
     if (coll_config_elem == null||build_config_elem == null) {
-        // wont be able to do any of teh requests
+        // wont be able to do any of the requests
         return false;
     }    
     
     if (subset.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
-        Element service_rack_list = (Element)GSXML.getChildByTagName(build_config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
-        
-        return configureServiceRack(service_rack_list, coll_config_elem);
+      return configureServiceRacks(coll_config_elem, build_config_elem);
     }