Changeset 4036

Timestamp:

2003-03-28T15:10:24+12:00 (21 years ago)

Author:

kjdon

Message:

the service list got from MR may have services from a remote site - you need to use the service name that was supplied by the MR description, rather than the one that comes back in the service description - eventually we may get rid of the service element in the descripiton response

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -353 +353 @@
         Element enrich_response = mr_.process(enrich_message);
 
-        e_services = enrich_response.getElementsByTagName(GSXML.SERVICE_ELEM);
+        NodeList e_responses = enrich_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
         Element service_list = doc_.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
-        for (int i=0; i<e_services.getLength(); i++) {
-            Element pl = (Element)GSXML.getChildByTagName(e_services.item(i), GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        for (int i=0; i<e_responses.getLength(); i++) {
+            Element e_resp = (Element)e_responses.item(i);
+            Element e_service = (Element)doc_.importNode(GSXML.getChildByTagName(e_resp, GSXML.SERVICE_ELEM), true); 
+            e_service.setAttribute(GSXML.NAME_ATT, e_resp.getAttribute(GSXML.FROM_ATT));
+            Element pl = (Element)GSXML.getChildByTagName(e_service, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
             if (pl != null) {
             // add short names to the params in the param list
             cgi_.paramListAddShortNames(pl);
             }
-            service_list.appendChild(doc_.importNode(e_services.item(i), true));
+            service_list.appendChild(e_service);
         }
         page_response.appendChild(service_list);