Changeset 25860

Timestamp:

2012-06-28T11:47:25+12:00 (11 years ago)

Author:

sjm84

Message:

Add the facet list to the page if we get one

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

@@ -51 +51 @@
     protected Element basicQuery(Element request)
     {
-
         // the result
         Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
@@ -86 +85 @@
             Element mr_info_response = (Element) this.mr.process(mr_info_message);
             // the response
-            
+
             Element service_response = (Element) GSXML.getChildByTagName(mr_info_response, GSXML.RESPONSE_ELEM);
 
@@ -161 +160 @@
         { // add it into the page response
             page_response.appendChild(this.doc.importNode(query_term_info_list, true));
+        }
+
+        Element facet_list = (Element) GSXML.getChildByTagName(query_response, GSXML.FACET_ELEM + GSXML.LIST_MODIFIER);
+        if (facet_list == null)
+        {
+            logger.error("No query term information.\n");
+        }
+        else
+        { // add it into the page response
+            page_response.appendChild(this.doc.importNode(facet_list, true));
         }
 
@@ -227 +236 @@
 
         Element mr_metadata_response = (Element) this.mr.process(mr_metadata_message);
+        
         // check for errors
         processErrorElements(mr_metadata_response, page_response);