Changeset 3914

Timestamp:

2003-03-19T14:32:16+12:00 (21 years ago)

Author:

kjdon

Message:

now gets format info from service

File:

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

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

@@ -78 +78 @@
     // for now get this again from the service. 
     // this will probably need to be cached somehow later on. 
-    Element mr_info_message = createDescribeRequest(to, lang, null);
+    Element mr_info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element mr_info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang);
+    mr_info_message.appendChild(mr_info_request);
+
+    // also get the format stuff now if there is some
+    Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
+    mr_info_message.appendChild(format_request);
+
     Element mr_info_response = (Element) mr_.process(mr_info_message);
     
@@ -120 +127 @@
     page.appendChild(description);
     
+    Element format_response = (Element)mr_info_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1); // the second response
+
     // just a display request
     if (request_type.equals("d")) {
@@ -130 +139 @@
     // do the query
     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    Element mr_query_request = doc_.createElement(GSXML.REQUEST_ELEM);
+    Element mr_query_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_QUERY, to, page.getAttribute(GSXML.LANG_ATT));
     mr_query_message.appendChild(mr_query_request);
     
-    mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
-    mr_query_request.setAttribute(GSXML.TO_ATT, to);
-    mr_query_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
     // paramList
     Element query_param_list = (Element)doc_.importNode(cgi_param_list, true);
@@ -177 +183 @@
     }
     
+    // add in the format info
+    Element format_elem = (Element)GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
+    if (format_elem != null) {
+        GSXSLT.mergeStylesheets(style_doc, format_elem);
+    }
+    
+
     // we have a doc list, so get the metadata - for now, get title.
     // can we dynamically decide what metadata to get?