Changeset 27145 for main/trunk

Timestamp:

2013-03-28T14:01:26+13:00 (11 years ago)

Author:

kjdon

Message:

get the format info even when we are just displaying the search page. This means that we will get any global format info, including for example additionalHeaderContent template which may link to a different theme just for the collection

File:

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

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

@@ -70 +70 @@
         }
 
+        // get the format info - there may be global format info in the collection that searching needs
+        Element format_elem = getFormatInfo(to, userContext);
+        // set the format type
+        format_elem.setAttribute(GSXML.TYPE_ATT, "search");
+        // for now just add to the response
+        page_response.appendChild(this.doc.importNode(format_elem, true));
+
         if (request_type.indexOf("d") != -1)
         {
@@ -115 +122 @@
         mr_query_request.appendChild(query_param_list);
 
-        // also get the format stuff now if there is some
-        Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, userContext);
-        mr_query_message.appendChild(format_request);
-
         logger.debug(GSXML.xmlNodeToString(mr_query_message));
 
@@ -133 +136 @@
         }
 
-        NodeList responses = mr_query_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
-        Element query_response = (Element) responses.item(0);
-        Element format_response = (Element) responses.item(1);
-
+        Element query_response = (Element) GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
         Element query_result_metadata_list = (Element) GSXML.getChildByTagName(query_response, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         if (query_result_metadata_list == null)
@@ -196 +196 @@
         HashSet<String> metadata_names = new HashSet<String>();
         metadata_names.add("Title");
-        // add in the format info to the stylesheet if there is any
-        Element format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
+        // we already got the format element earlier
         if (format_elem != null)
         {
-            Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.GLOBAL_FORMAT_ELEM);
-            if (global_format_elem != null)
-            {
-                GSXSLT.mergeFormatElements(format_elem, global_format_elem, false);
-            }
-            // set the format type
-            format_elem.setAttribute(GSXML.TYPE_ATT, "search");
-            // for now just add to the response
-            page_response.appendChild(this.doc.importNode(format_elem, true));
-            getRequiredMetadataNames(format_elem, metadata_names);
+          getRequiredMetadataNames(format_elem, metadata_names);
         }