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

Timestamp:

2015-07-21T05:26:46+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

While using Solr field highlighted by Solr Servlet. Also added snippets to search results while using Solr.

File:

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

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

@@ -157 +157 @@
         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)
         {
@@ -260 +261 @@
         Element mr_metadata_response = (Element) this.mr.process(mr_metadata_message);
 
+        Element query_result_snippet_list = (Element) GSXML.getChildByTagName(query_response, GSXML.HL_SNIPPET_ELEM + GSXML.LIST_MODIFIER);
+        
         // check for errors
         processErrorElements(mr_metadata_response, page_response);
@@ -266 +269 @@
 
         Element query_result_document_list = (Element) GSXML.getChildByTagName(metadata_response, GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
-
+                
         if (query_result_document_list != null)
         {
             page_response.appendChild(doc.importNode(query_result_document_list, true));
-        }
-
+            page_response.appendChild(doc.importNode(query_result_snippet_list,true));
+        }
+        
         //logger.debug("Query page:\n" + this.converter.getPrettyString(page_response));
         //append site metadata