Changeset 4950

Timestamp:

2003-07-16T15:15:53+12:00 (21 years ago)

Author:

kjdon

Message:

now about action gets the service descriptions for each service, so it can display the service name rather than internal id

File:

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

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

@@ -120 +120 @@
     Element coll_about_response = (Element)mr_.process(coll_about_message);
 
-    // get the response element and return it
+    if (coll_about_response == null) {
+        return null;
+    }
+    
+    // second, get the info for each service - we only want display items 
+    // but for now, we'll just get it all
+    NodeList services = coll_about_response.getElementsByTagName(GSXML.SERVICE_ELEM);
+    // we will send all the requests in a single message
+    Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
+    for (int i=0; i<services.getLength(); i++) {
+        Element c = (Element)services.item(i);
+        String name = c.getAttribute(GSXML.NAME_ATT);
+        String address = GSPath.appendLink(coll_name, name);
+        Element info_request = GSXML.createBasicRequest(doc_,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
+        info_message.appendChild(info_request);
+    }
+
+    Element info_response = (Element)mr_.process(info_message);
+
+    NodeList service_responses = info_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
+    // check that have same number of responses as collections
+    if (services.getLength() != service_responses.getLength()) {
+        System.err.println("PageAction Error: didn't get a response for each service - somethings gone wrong!");
+        // for now, dont use the metadata
+    } else {
+        for (int i=0; i<services.getLength(); i++) {
+        Element c1 = (Element)services.item(i);
+        Element c2 = (Element)GSXML.getChildByTagName((Element)service_responses.item(i), GSXML.SERVICE_ELEM);
+        if (c1.getAttribute(GSXML.NAME_ATT).equals(c2.getAttribute(GSXML.NAME_ATT))) {
+            //add the service data into the original response
+            GSXML.mergeElements(c1, c2);
+        } else {
+            System.err.println("PageAction Error: response does not correspond to request!");
+        } 
+        
+        }
+    }
+    
+    //now the full response message is in coll_list_response
+    // return the response element
     Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM);
     return response;
-    
     }
+
 
     /** if we dont know the page type, use this method */