Changeset 4942

Timestamp:

2003-07-16T13:50:18+12:00 (21 years ago)

Author:

kjdon

Message:

some coll metadata is now displayItems instead, so the configuration and processing has to take that into account

Location:

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

Files:

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

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

@@ -51 +51 @@
 
     public Collection() {
-    this.service_map = new HashMap();
-    this.converter = new XMLConverter();
-    this.transformer = new XMLTransformer();
-    this.doc = this.converter.newDOM();
+    super();
     this.description = this.doc.createElement(GSXML.COLLECTION_ELEM);
     
@@ -82 +79 @@
         return false;
     }
-    // process the metadata
-    findAndLoadMetadata(coll_config_xml, build_config_xml);
-
+    // process the metadata and display items
+    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);
@@ -127 +124 @@
 
     /**
-     * find the metadata from the two config files and add it to a new 
-     * metadata list  
+     * find the metadata and display elems from the two config files and add it to the appropriate lists
      */
-    protected boolean findAndLoadMetadata(Element coll_config_xml, 
-                      Element build_config_xml){
+    protected boolean findAndLoadInfo(Element coll_config_xml, 
+                      Element build_config_xml){
 
-    this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    // metadata
     Element meta_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     addMetadata(meta_list);
@@ -142 +138 @@
     GSXML.addMetadata(this.doc, meta_list, "httpPath", this.site_http_address+"/collect/"+this.cluster_name);
     addMetadata(meta_list);
+
+    // display stuff
+    Element display_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER);
+    if (display_list != null) {
+        addDisplayItems(display_list);
+    }
     return true;
 
@@ -164 +166 @@
     } 
 
-    if (subset.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) {
-        return findAndLoadMetadata(coll_config_elem, build_config_elem);
+    if (subset.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER) || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
+        return findAndLoadInfo(coll_config_elem, build_config_elem);
         
     }

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

@@ -73 +73 @@
     /** list of services */
     protected Element service_list = null;
-    /** list of Metadata - lang independent */
+    /** list of metadata - all metadata, regardless of language goes in here */
     protected Element metadata_list = null;
     /** language specific stuff */
-    protected Element lang_specific_metadata_list = null;
+    //protected Element lang_specific_metadata_list = null;
+    protected Element display_item_list = null;
     /** the element that will have any descriptions passed back in */
     protected Element description = null;
@@ -102 +103 @@
     this.doc = this.converter.newDOM();
     this.description = this.doc.createElement(GSXML.CLUSTER_ELEM);
-    
+    this.display_item_list = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER);
     }
 
@@ -147 +148 @@
     public boolean configure(Element service_cluster_info) {
     
-    // do the metadata
-    this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     // 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);
@@ -157 +156 @@
         }
     }
+
+    // get the display info
+    Element display_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER);
+    if (display_list !=null) {
+        if (!addDisplayItems(display_list)) {
+        
+        System.err.println("couldn't configure the display items");
+        }
+    }
+    
 
     // do the service racks
@@ -166 +175 @@
     } else {
         
-        boolean result = configureServiceRack(service_rack_list, null);
-        if (result == false) {
+        if (!configureServiceRack(service_rack_list, null)) {
         System.err.println("couldn't configure the  service racks!!");
         return false;
@@ -177 +185 @@
     
     /** adds metadata from a metadataList into the metadata_list xml 
-     * language independent stuff goes inot the main list, lang dependent stuff
-     * goes into a separate element, like:
-     * <metadataList><metadata name="Title"><metadata name="Title" lang="en">xxx</metadata><metadata name="Title" lang="fr">yyy</metadata></metadata></metadataList>
-     * this is a bit wasteful on space but is the easiest to process (that I've thought of so far) 
      */
     protected boolean addMetadata(Element metadata_list) {
     
-    NodeList metanodes = metadata_list.getElementsByTagName(GSXML.METADATA_ELEM);
-    if (metanodes.getLength()>0) {  
-        for(int k=0; k<metanodes.getLength(); k++) {
-        Element m = (Element) metanodes.item(k);
-        String lang = m.getAttribute(GSXML.LANG_ATT);
+    if (this.metadata_list == null) {
+        this.metadata_list = (Element)this.doc.importNode(metadata_list, true);
+    } else {
+        
+        NodeList metanodes = metadata_list.getElementsByTagName(GSXML.METADATA_ELEM);
+        if (metanodes.getLength()>0) {  
+        for(int k=0; k<metanodes.getLength(); k++) {
+            this.metadata_list.appendChild(this.doc.importNode(metanodes.item(k), true));
+        }
+        }
+    }
+    return true;
+    }
+
+    protected boolean addDisplayItems(Element display_list) {
+    
+    NodeList displaynodes = display_list.getElementsByTagName(GSXML.DISPLAY_TEXT_ELEM);
+    if (displaynodes.getLength()>0) {   
+        for(int k=0; k<displaynodes.getLength(); k++) {
+        Element d = (Element) displaynodes.item(k);
+        String lang = d.getAttribute(GSXML.LANG_ATT);
         if (lang==null||lang.equals("")) {
-            // just add it to the normal list
-            this.metadata_list.appendChild(this.doc.importNode(m,true));
-        } else {
-            String name = m.getAttribute(GSXML.NAME_ATT);
-            // add it to the lang-dependent list
-            if (this.lang_specific_metadata_list == null) {
-            this.lang_specific_metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
-            }
-            Element this_meta = GSXML.getNamedElement(this.lang_specific_metadata_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, name);
-            if (this_meta==null) {
-            this_meta = this.doc.createElement(GSXML.METADATA_ELEM);
-            this_meta.setAttribute(GSXML.NAME_ATT, name);
-            this.lang_specific_metadata_list.appendChild(this_meta);
-            }
+            //set the lang to teh default
+            d.setAttribute(GSXML.LANG_ATT, DEFAULT_LANG);
+        }
+        String name = d.getAttribute(GSXML.NAME_ATT);
+        System.out.println("adding display named "+name);
+        Element this_item = GSXML.getNamedElement(this.display_item_list, GSXML.DISPLAY_TEXT_ELEM, GSXML.NAME_ATT, name);
+        if (this_item==null) {
+            this_item = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM);
+            this_item.setAttribute(GSXML.NAME_ATT, name);
+            this.display_item_list.appendChild(this_item);
+        }
+        
+        this_item.appendChild(this.doc.importNode(d, true));
             
-            this_meta.appendChild(this.doc.importNode(m, true));
-            
-        }
-        }
-    }        
+        
+        }
+    }
+    
     return true;
     }
@@ -369 +387 @@
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list == null) {
+        addAllDisplayInfo(description, lang);
         description.appendChild(this.service_list);
-        description.appendChild(oneLanguageMetadata( lang));
+        description.appendChild(this.metadata_list);
         return response;
         }
@@ -385 +404 @@
             description.appendChild(this.service_list);
             } else if (info.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) {
-            description.appendChild(oneLanguageMetadata(lang));
-            } 
+            description.appendChild(metadata_list);
+            } else if (info.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
+            addAllDisplayInfo(description, lang);
+            
+            }
         }
         }
@@ -502 +524 @@
     } 
 
-    /** takes a metadata list and deletes any items that are not in the right lang, if there is a correct one present. 
-     * its a bit of a hack */
-    protected Element oneLanguageMetadata(String lang) {
-    
-    Element meta_list = (Element)this.metadata_list.cloneNode(true);
-    // go through and add lang dependent ones unwanted elements
-    if (this.lang_specific_metadata_list==null) {
-        return meta_list;
-    }
-    NodeList metas = this.lang_specific_metadata_list.getChildNodes();
-    for (int i=0; i<metas.getLength(); i++) {
-        Element m = (Element) metas.item(i);
+
+    protected boolean addAllDisplayInfo(Element description, String lang) {
+    
+    NodeList items = this.display_item_list.getChildNodes();
+    for (int i=0; i<items.getLength(); i++) { // for each key
+        Element m = (Element) items.item(i);
         // find the child with the correct language
-        Element new_m = GSXML.getNamedElement(m, GSXML.METADATA_ELEM, GSXML.LANG_ATT, lang);
-        if (new_m==null) {
+        Element new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, lang);
+        if (new_m==null && lang != DEFAULT_LANG) {
         // use the default lang
-        new_m = GSXML.getNamedElement(m, GSXML.METADATA_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
+        new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
         }
         if (new_m==null) {
         // just get the first one
-        new_m = (Element)GSXML.getChildByTagName(m, GSXML.METADATA_ELEM);
-        }
-        meta_list.appendChild(this.doc.importNode(new_m, true));
-    }
-    return meta_list;
+        new_m = (Element)GSXML.getChildByTagName(m, GSXML.DISPLAY_TEXT_ELEM);
+        }
+        description.appendChild(new_m.cloneNode(true));
+    }
+    return true;
+    
+    }
+
+    
+    protected Element getDisplayTextElement(String key, String lang) {
+    
+    Element this_item = GSXML.getNamedElement(this.display_item_list, GSXML.DISPLAY_TEXT_ELEM, GSXML.NAME_ATT, key);
+    if (this_item == null) {
+        return null;
+    }
+
+    Element this_lang = GSXML.getNamedElement(this_item, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, lang);
+    if (this_lang == null && lang != DEFAULT_LANG) {
+        // try the default
+        this_lang = GSXML.getNamedElement(this_item, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
+    }
+    if (this_lang == null) {
+        // just return the first one
+        return (Element)this_item.getFirstChild().cloneNode(true);
+    }
+    return (Element)this_lang.cloneNode(true);
     
     }