Changeset 37614

Timestamp:

2023-04-06T16:54:00+12:00 (13 months ago)

Author:

kjdon

Message:

now looks for a ccServices element (cross collection) - and stores its format elements. if the coll gets a format request come in, with a service attribute, it looks up that service name to see if there is a format element for it, and returns it if there is.

File:

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

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

@@ -89 +89 @@
     protected ArrayList<HashMap<String, ArrayList<String>>> _securityExceptions = new ArrayList<HashMap<String, ArrayList<String>>>();
 
+  protected HashMap<String, Element> _ccServiceFormats = new HashMap<String, Element>();
     protected XMLTransformer transformer = null;
 
@@ -161 +162 @@
         this.description.setAttribute(GSXML.DB_TYPE_ATT, db_type);
 
-        _globalFormat = (Element) GSXML.getChildByTagName(coll_config_xml, GSXML.FORMAT_ELEM);
         // process the metadata and display items and default library params
         super.configureLocalData(coll_config_xml);
         super.configureLocalData(build_config_xml);
+                
         // get extra collection specific stuff
+                _globalFormat = (Element) GSXML.getChildByTagName(coll_config_xml, GSXML.FORMAT_ELEM);
+                loadCCServiceFormats(coll_config_xml);
+
         findAndLoadInfo(coll_config_xml, build_config_xml);
 
@@ -309 +313 @@
     }
 
+  protected void loadCCServiceFormats(Element coll_config_xml) {
+
+    Element ccservice = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.CC_SERVICES_ELEM);
+    if (ccservice == null) return;
+    NodeList format_elems = GSXML.getChildrenByTagName(ccservice, GSXML.FORMAT_ELEM);
+    for (int i = 0; i < format_elems.getLength(); i++)
+    {
+      Element child = (Element)format_elems.item(i);
+      String service_name = child.getAttribute(GSXML.SERVICE_ATT);
+      if (!service_name.equals("")) {
+        _ccServiceFormats.put(service_name, child);
+      }
+    }
+  }
     protected void loadSecurityInformation(Element coll_config_xml)
     {
@@ -489 +507 @@
     {
         String type = request.getAttribute(GSXML.TYPE_ATT);
+
         if (type.equals(GSXML.REQUEST_TYPE_FORMAT_STRING))
         {
@@ -499 +518 @@
         else if (type.equals(GSXML.REQUEST_TYPE_FORMAT))
         {
-
-            Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
-            response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
-            response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
-            if (_globalFormat != null)
-            {
-                response.appendChild(result_doc.importNode(_globalFormat, true));
-            }
-            return response;
+                  Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
+                  response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
+                  response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
+        
+                  // if we have a service arg, return format for that service - if any
+                  String service_name = request.getAttribute(GSXML.SERVICE_ATT);
+                  if (!service_name.equals("")) {
+                    Element this_format = _ccServiceFormats.get(service_name);
+                    if (this_format != null) {
+                      response.appendChild(result_doc.importNode(this_format, true));
+                    }
+                    return response; // if a service_name was specified, return
+                      // the format, or empty response
+                  }
+                  
+                  // no service_name specified, return global format
+                  if (_globalFormat != null)
+                  {
+                    response.appendChild(result_doc.importNode(_globalFormat, true));
+                  }
+                  return response;
         }
         // unknown type