Changeset 21771


Ignore:
Timestamp:
2010-03-08T16:17:11+13:00 (11 years ago)
Author:
kjdon
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

    r21312 r21771  
    4040 *
    4141 * @author <a href="mailto:kjdon@cs.waikato.ac.nz">Katherine Don</a>
    42  * @version $Revision$
    4342 * @see ModuleInterface
    4443 */
     
    238237    clearServices();
    239238    Element service_list = (Element)GSXML.getChildByTagName(build_config_xml, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
    240     configureServiceRack(service_list, coll_config_xml);
    241    
    242     // Check for oai
    243     Element oai_service_rack = GSXML.getNamedElement(service_list, GSXML.SERVICE_CLASS_ELEM, OAIXML.NAME, OAIXML.OAIPMH);
    244     if (oai_service_rack == null) {
    245       has_oai = false;
    246       logger.info("No oai for collection: " + this.cluster_name);
    247      
    248     } else {
    249       has_oai = true;
    250     }
    251    
     239    configureServiceRackList(service_list, coll_config_xml);
     240       
    252241    // collection Config may also contain manually added service racks
    253242    service_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
    254243    if (service_list != null) {
    255       configureServiceRack(service_list, coll_config_xml);
     244      configureServiceRackList(service_list, build_config_xml);
     245     
     246      // Check for oai
     247      Element oai_service_rack = GSXML.getNamedElement(service_list, GSXML.SERVICE_CLASS_ELEM, OAIXML.NAME, OAIXML.OAIPMH);
     248      if (oai_service_rack == null) {
     249    has_oai = false;
     250    logger.info("No oai for collection: " + this.cluster_name);
     251   
     252      } else {
     253    has_oai = true;
     254      }
    256255    }
    257256    return true;
Note: See TracChangeset for help on using the changeset viewer.