Changeset 30553 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

Timestamp:

2016-06-02T14:11:02+12:00 (8 years ago)

Author:

kjdon

Message:

added ability for teh collectionConfig.xml file to carry additional stuff. Can have extraInfo element at the top level (inside collectionConfig). For now this is used to add extra items to the navigation bar (<navigationTab type=external-link

File:

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

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

@@ -93 +93 @@
 
     protected Element display_item_list = null;
+  /** extra stuff */
+  protected Element extra_info = null;
   /** default values for servlet params */
   protected Element library_param_list = null;
@@ -146 +148 @@
         this.library_param_list = this.desc_doc.createElement(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER);
         this.service_list = this.desc_doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        this.extra_info = this.desc_doc.createElement(GSXML.EXTRA_INFO_ELEM);
         //this.plugin_item_list = this.desc_doc.createElement(GSXML.PLUGIN_ELEM + GSXML.LIST_MODIFIER);
     }
@@ -273 +276 @@
           }
         }
-
-  }
+        
+        // get any extra info
+        Element info = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.EXTRA_INFO_ELEM);
+        if (info != null) {
+          if (!addExtraInfo(info)) {
+            logger.error("couldn't add extra info");
+          }
+        }
+
+    }
     /**
      * adds metadata from a metadataList into the metadata_list xml
@@ -336 +347 @@
         return true;
     }
+
+  protected boolean addExtraInfo(Element info) {
+    if (info == null) {
+      return false;
+    }
+    NodeList children = info.getChildNodes();
+    for(int i=0; i<children.getLength(); i++) {
+      this.extra_info.appendChild(this.desc_doc.importNode(children.item(i), true));
+    }
+    return true;
+  }
 
     // protected boolean addPlugins(Element plugin_list)
@@ -652 +674 @@
                 description.appendChild(result_doc.importNode(this.metadata_list, true));
                 description.appendChild(result_doc.importNode(this.library_param_list, true));
+                description.appendChild(result_doc.importNode(this.extra_info, true));
                 //description.appendChild(this.plugin_item_list);
                 return response;
@@ -682 +705 @@
                       description.appendChild(result_doc.importNode(this.library_param_list, true));
                     }
+                    else if (info.equals(GSXML.EXTRA_INFO_ELEM)) {
+                      description.appendChild(result_doc.importNode(this.extra_info, true));
+                    }
                 }
             }
@@ -769 +795 @@
          * }
          */
+
         if (type.equals(GSXML.REQUEST_TYPE_SYSTEM))
         {
@@ -780 +807 @@
         return response;
     }
-
     protected Element processSystemRequest(Element request)
     {