Changeset 3934

Timestamp:

2003-03-20T13:42:04+12:00 (21 years ago)

Author:

kjdon

Message:

configureServiceRack now takes two args - one is an optional elem potentially containing some info that a service may need for configuration eg the collection config file has the format and display elements.
The task of deciding which elements in teh extra info are needed for a service has been moved to the service itself, rather than done in the collection - so configure for service now takes the two args, not one.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection

Files:

• Collection.java (modified) (1 diff)
• ServiceCluster.java (modified) (4 diffs)

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

@@ -110 +110 @@
     configureServiceRack(service_list, coll_config_xml);
     
-    //System.out.println("description=");
-    //System.out.println(converter_.getString(description_));
     return true;
     
     }
 
-    /** we need to overwrite this, cos in a collection, some of the info for the service racks is in the collectionConfig.xml file - this needs to be added to the xml for the service rack before configure is called */
-    protected boolean configureServiceRack(Element service_rack_list, 
-                       Element coll_config_xml) {
-    
-    // create all the services
-    NodeList nodes = service_rack_list.getElementsByTagName(GSXML.SERVICE_CLASS_ELEM);
-    if (nodes.getLength()==0) {
-        System.err.println("Cluster configuration error: cluster "+cluster_name_+" has no service modules!");
-        return false;
-    }
-
-    for(int i=0; i<nodes.getLength(); i++) {
-    
-        // the xml request to send to the serviceRack to query what
-        // services it provides
-        Element message = doc_.createElement(GSXML.MESSAGE_ELEM);
-        Element request = doc_.createElement(GSXML.REQUEST_ELEM);
-        message.appendChild(request);
-        request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
-        request.setAttribute(GSXML.INFO_ATT, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-        
-
-        Element n = (Element)nodes.item(i);
-        String servicetype = n.getAttribute(GSXML.NAME_ATT);
-        
-        addExtraServiceRackInfo(n, coll_config_xml); // add in any display or format stuff from collectionConfig.xml
-
-        try {
-        ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+servicetype).newInstance();
-
-        s.setSiteHome(site_home_);
-        s.setClusterName(cluster_name_);
-        s.setMessageRouter(router_);
-        // pass the xml node to the service for configuration
-        s.configure(n);
-        
-        // find out the supported service types for this service module
-        Node types = s.process(message);
-        NodeList typenodes = ((Element)types).getElementsByTagName(GSXML.SERVICE_ELEM);    
-        
-        for (int j=0; j<typenodes.getLength();j++) {
-            String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);        
-            service_map_.put(service, s);
-            
-            // also add info to the ServiceInfo XML element
-            service_info_.appendChild(doc_.importNode(typenodes.item(j), true));
-        }
-        } catch (Exception e) {
-        System.err.println("ServiceCluster Error:  configure exception: couldn't create service module:org.greenstone.gsdl3.service."+servicetype+"\n"+e.getMessage() + e.getClass() );
-        e.printStackTrace();
-        //return false;
-        }
-        
-    }
-    // add elements to description
-    description_.appendChild(service_info_);
-    
-    return true;
-    
-    
-    }
-
-    /** the service rack desription in buildConfig.xml is not complete - 
-     * any display or format info specified in the collectionConfig.xml file
-     * is not copied over. So that info needs to be added to the service rack
-     * description before configuring the service. 
-     * extra info is possible for index and classifier elements so far */
-    protected boolean addExtraServiceRackInfo(Element service_rack_info,
-                          Element coll_config_xml) {
-
-    NodeList indexes = service_rack_info.getElementsByTagName(GSXML.INDEX_ELEM);
-    
-    if (indexes !=null) {
-        Element config_search = (Element)GSXML.getChildByTagName(coll_config_xml, 
-                                GSXML.SEARCH_ELEM);
-        addFormatInfo(indexes, GSXML.INDEX_ELEM, config_search);
-
-    }
-
-    NodeList classifiers = service_rack_info.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
-    if (classifiers !=null) {
-        Element config_browse = (Element)GSXML.getChildByTagName(coll_config_xml,
-                                GSXML.BROWSE_ELEM);
-
-        addFormatInfo(classifiers, GSXML.CLASSIFIER_ELEM, config_browse);
-
-    }
-    return true;
-    }
-
-    protected boolean addFormatInfo(NodeList node_list, String node_name,
-                    Element extra_info) {
-
-    //Document doc = node_list.item(0).getOwnerDocument();
-    for (int i=0; i<node_list.getLength();i++) {
-        Element node = (Element)node_list.item(i);
-        String name = node.getAttribute(GSXML.NAME_ATT);
-        Document doc = node.getOwnerDocument();
-        Element node_extra = GSXML.getNamedElement(extra_info,
-                               node_name,
-                               GSXML.NAME_ATT,
-                               name);
-        if (node_extra == null) {
-        System.out.println("haven't found extra info for "+node_name+" named "+name);
-        }
-        // get the display elements if any - displayName
-        NodeList display_names = node_extra.getElementsByTagName(GSXML.DISPLAYNAME_ELEM);
-        if (display_names !=null) {
-        Element display = doc.createElement(GSXML.DISPLAY_ELEM);
-        for (int j=0; j<display_names.getLength(); j++) {
-            Element e = (Element)display_names.item(j);
-            
-            Element display_name = GSXML.createTextElement(doc, GSXML.DISPLAY_NAME_ELEM, GSXML.getNodeText(e));
-            display_name.setAttribute(GSXML.LANG_ATT, e.getAttribute(GSXML.LANG_ATT));
-            display.appendChild(display_name);
-        }
-        node.appendChild(display);
-        }
-        
-        // get the format element if any 
-        Element format = (Element)GSXML.getChildByTagName(node_extra, GSXML.FORMAT_ELEM);
-        if (format==null) {
-        format = (Element)GSXML.getChildByTagName(extra_info,
-                              GSXML.FORMAT_ELEM);
-        }
-        if (format!=null) { // append to index info
-        
-        // find the transform xsl file
-        String transform_file = GSFile.configFileFormatStylesheet();
-        if (transform_file.equals("")) {
-            System.out.println("Collection: couldn't find the config file format transform file!!");
-            // just append the original instead 
-            node.appendChild(doc.importNode(format, true));
-        } else {
-            
-            Document stylesheet = converter_.getDOM(new File(transform_file));
-            Element new_format = (Element)transformer_.transform(stylesheet, format);
-            
-            node.appendChild(doc.importNode(new_format, true));
-        }
-        }
-    }
-    return true;
-    }
-
-    
 }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -160 +160 @@
     } else {
         
-        boolean result = configureServiceRack(service_rack_list);
+        boolean result = configureServiceRack(service_rack_list, null);
         if (result == false) {
         System.err.println("couldn't configure the  service racks!!");
@@ -170 +170 @@
     }
     
+    /** adds metadata from a metadataList into the meta_info_ xml */ 
     protected boolean configureMetadata(Element metadata_list) {
     NodeList metanodes = metadata_list.getElementsByTagName(GSXML.METADATA_ELEM);
@@ -180 +181 @@
     }
     
-  
-    protected boolean configureServiceRack(Element service_rack_list) {
+    /** creates and configures all the services - extra_info is some more xml 
+that is passed to teh service  - eg used for coll config files for Collection
+    */
+    protected boolean configureServiceRack(Element service_rack_list, 
+                       Element extra_info) {
     
     // create all the services
@@ -211 +215 @@
         s.setMessageRouter(router_);
         // pass the xml node to the service for configuration
-        s.configure(n);
+        s.configure(n, extra_info);
         
         // find out the supported service types for this service module