Changeset 3999

Timestamp:

2003-03-26T12:13:45+12:00 (21 years ago)

Author:

kjdon

Message:

code tidy

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (6 diffs)

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

@@ -75 +75 @@
     String to = GSPath.appendLink(collection, service_name);
 
+    //create teh pageREsponse
+    Element page_response = doc_.createElement(GSXML.PAGE_RESPONSE_ELEM);
+    page.appendChild(page_response);
+    
     // the second part of the page is the service description 
     // for now get this again from the service. 
@@ -86 +90 @@
     mr_info_message.appendChild(format_request);
 
+    // also get the coll description
+    Element coll_about_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  collection, lang);
+    mr_info_message.appendChild(coll_about_request);
+
+    // process the messages
     Element mr_info_response = (Element) mr_.process(mr_info_message);
     
-    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
-    Element description = (Element)doc_.importNode(GSXML.getNodeByPath(mr_info_response, path), true);
-    Element pl = (Element)GSXML.getChildByTagName(description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    // the three responses
+    NodeList responses = mr_info_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
+    Element service_response = (Element)responses.item(0);
+    Element format_response = (Element)responses.item(1);
+    Element coll_response = (Element)responses.item(2);
+    
+    Element service_description = (Element)doc_.importNode(GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM), true);
+    page_response.appendChild(service_description);
+    
+    Element pl = (Element)GSXML.getChildByTagName(service_description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     
     if (pl !=null) {
@@ -124 +140 @@
     }
 
-    // get the collection or cluster description
-    Element coll_about_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    Element coll_about_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  collection, page.getAttribute(GSXML.LANG_ATT));
-    coll_about_message.appendChild(coll_about_request);
-    Element coll_about_response = (Element)mr_.process(coll_about_message);
-
-    // add the response to the page 
-    Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM);
-    Element page_response = GSXML.duplicateWithNewName(doc_, response, "pageResponse", false);
-    page_response.appendChild(description);
-
-    Element format_response = (Element)mr_info_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1); // the second response
+    
+    // add the coll-response to the page 
+    Element coll_description = (Element)GSXML.getChildByTagName(coll_response, GSXML.COLLECTION_ELEM);
+    page_response.appendChild(doc_.importNode(coll_description, true));
+
 
     // just a display request
     if (request_type.equals("d")) {
-        page.appendChild(page_response);
         System.out.println("(QueryAction) Finished page:\n" + converter_.getPrettyString(page));
         // output the page
@@ -157 +165 @@
         Element mr_query_response = (Element)mr_.process(mr_query_message);
 
-    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
     if (query_result_metadata_list == null) {
@@ -180 +188 @@
     if (document_list == null) {
         
-        Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
-
-        page.appendChild(doc_.importNode(result_response, true));
+        //Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
+
+        //page.appendChild(doc_.importNode(result_response, true));
         GSXSLT.absoluteIncludePaths(style_doc, config_);
         return (Element)transformer_.transform(style_doc, page);    
@@ -231 +239 @@
     }
 
-    // Add the pageResponse element to the page
-    page.appendChild(page_response);
     // System.out.println("Query page:\n" + converter_.getPrettyString(page));