Changeset 3971

Timestamp:

2003-03-25T09:46:40+12:00 (21 years ago)

Author:

kjdon

Message:

info att in a request is now a param, MR adds empty from att

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -123 +123 @@
     description_ = doc_.createElement(GSXML.RESPONSE_ELEM);
     description_.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
+    description_.setAttribute(GSXML.FROM_ATT, "");
     collection_list_ = doc_.createElement(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER);
     cluster_list_ = doc_.createElement(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
@@ -186 +187 @@
      */
     public Element process(Element message) {
-    
+
     // check that its a correct message tag
     if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) {
@@ -236 +237 @@
         
     } // for each request
-
+    
     return mainResult;
     
@@ -518 +519 @@
     String type = req.getAttribute(GSXML.TYPE_ATT);
     Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
-    
+    response.setAttribute(GSXML.FROM_ATT, "");
     if (type.equals(GSXML.REQUEST_TYPE_DESCRIBE)) {
-        String info = req.getAttribute(GSXML.INFO_ATT);
-        if (info.equals("")) {
-        // return full description
-        return description_;
-        }
+        // check the param list
+        Element param_list = (Element) GSXML.getChildByTagName(req, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        if (param_list == null) {
+        // no params - just return teh full description
+        return description_; // this is already in a response elem
+        }
+        System.out.println("poarams found, getting subset");
         // use the new response with the appropriate info 
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
         
-        if (info.equals(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER)) {
-        response.appendChild(collection_list_);
-        return response;
-        } else if (info.equals(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER)) {
-        response.appendChild(cluster_list_);
-        return response;
-        } else if (info.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
-        response.appendChild(service_list_);
-        return response;
-        } else if (info.equals(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER)) {
-        response.appendChild(site_list_);
-        return response;
-        } 
-
+        // go through the param list and see what components are wanted
+        Element param = (Element) param_list.getFirstChild();
+        while (param != null) {
+        if (!param.getNodeName().equals(GSXML.PARAM_ELEM)) {
+            System.err.println("Warning: Non-param in paramList (ignored).");
+            continue;
+        }
+        // Identify the structure information desired
+        if (param.getAttribute(GSXML.NAME_ATT) == GSXML.INFO_PARAM ) {
+            String info = param.getAttribute(GSXML.VALUE_ATT);
+            if (info.equals(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER)) {
+            response.appendChild(collection_list_);
+            
+            } else if (info.equals(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER)) {
+            response.appendChild(cluster_list_);
+            
+            } else if (info.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
+            return response;
+            } else if (info.equals(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER)) {
+            response.appendChild(site_list_);
+            } 
+        }
+        param = (Element)param.getNextSibling();
+        }
+        return response;
+        
     } else if (type.equals(GSXML.REQUEST_TYPE_CONFIGURE)) {