Changeset 14640 for greenstone3

Timestamp:

2007-10-10T17:41:52+13:00 (17 years ago)

Author:

anna

Message:

Added the buildType of a collection to its description, to generate ct param.

Location:

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

Files:

• Collection.java (modified) (3 diffs)
• ServiceCluster.java (modified) (5 diffs)

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

@@ -57 +57 @@
     /** time when this collection was built */
     protected long lastmodified = 0;
-
+    
     /** An element containing the serviceRackList element of buildConfig.xml, used to determine whether it contains
      *  the OAIPMH serviceRack 
@@ -98 +98 @@
         return false;
     }
+    
+    // get the collection type attribute
+    Element search = (Element) GSXML.getChildByTagName(coll_config_xml, GSXML.SEARCH_ELEM); 
+    if(search!=null) {
+        col_type = search.getAttribute(GSXML.TYPE_ATT);
+    }
+    
     // process the metadata and display items
     findAndLoadInfo(coll_config_xml, build_config_xml);
@@ -182 +189 @@
     protected boolean findAndLoadInfo(Element coll_config_xml, 
                       Element build_config_xml){
-      
+              
       // metadata
       Element meta_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);

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

@@ -60 +60 @@
     /** The name of the cluster - for a collection, this is the collection name*/
     protected String cluster_name = null;
+    /** collection type : mg or mgpp */
+    protected String col_type = "";
 
     /** a reference to the message router */
@@ -109 +111 @@
     this.cluster_name = name;   
     this.description.setAttribute(GSXML.NAME_ATT, name);
-    }  
+    }
 
     public void setMessageRouter(MessageRouter m) {
@@ -170 +172 @@
     
     public boolean configure(Element service_cluster_info) {
-    
+    
     // get the metadata - for now just add it to the list
     Element meta_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
@@ -468 +470 @@
         // create the collection element
         Element description = (Element)this.description.cloneNode(false);
+        // set collection type : mg or mgpp
+        description.setAttribute(GSXML.TYPE_ATT, col_type);
+
         response.appendChild(description);
         // check the param list
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-        if (param_list == null) {
-        addAllDisplayInfo(description, lang);
+        if (param_list == null) {               
+        addAllDisplayInfo(description, lang);               
         description.appendChild(this.service_list);
         description.appendChild(this.metadata_list);
@@ -481 +486 @@
         // go through the param list and see what components are wanted
         NodeList params = param_list.getElementsByTagName(GSXML.PARAM_ELEM);
-        for (int i=0; i<params.getLength(); i++) {
-        
-        Element param = (Element)params.item(i);
+        for (int i=0; i<params.getLength(); i++) {      
+        
+        Element param = (Element)params.item(i);                
         // Identify the structure information desired
         if (param.getAttribute(GSXML.NAME_ATT).equals(GSXML.SUBSET_PARAM)) {