Changeset 25850

Timestamp:

2012-06-28T11:19:29+12:00 (12 years ago)

Author:

sjm84

Message:

Advanced search and Form search now do paging. Also add facets to the results if they were used.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -37 +37 @@
 
 import org.apache.log4j.*;
+import org.apache.solr.client.solrj.response.FacetField;
 
 abstract public class AbstractGS2FieldSearch extends AbstractGS2TextSearch
@@ -186 +187 @@
                 Element tq_service = GSXML.getNamedElement(short_service_info, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, QUERY_SERVICE);
                 short_service_info.removeChild(tq_service);
-
             }
 
@@ -305 +305 @@
                     createParameter(INDEX_LANGUAGE_PARAM, param_list, lang);
                 }
+                
+                if (does_paging)
+                {
+                    createParameter(HITS_PER_PAGE_PARAM, param_list, lang);
+                    createParameter(START_PAGE_PARAM, param_list, lang);
+                }
+                
                 // create a multi param for the fields etc
                 // text box, field
@@ -356 +363 @@
                 {
                     createParameter(FIELD_ACCENT_PARAM, multiparam, lang);
+                }
+                if (does_paging)
+                {
+                    createParameter(HITS_PER_PAGE_PARAM, param_list, lang);
+                    createParameter(START_PAGE_PARAM, param_list, lang);
                 }
                 createParameter(FIELD_FIELD_PARAM, multiparam, lang);
@@ -653 +665 @@
         addTermInfo(term_list, params, query_result);
 
+        if (query_result instanceof SolrQueryResult)
+        {
+            Element facet_list = this.doc.createElement(GSXML.FACET_ELEM + GSXML.LIST_MODIFIER);
+            result.appendChild(facet_list);
+
+            if(((SolrQueryResult) query_result).getFacetResults() != null)
+            {
+                for (FacetField facet : ((SolrQueryResult) query_result).getFacetResults())
+                {
+                    Element facet_elem = this.doc.createElement(GSXML.FACET_ELEM);
+                    facet_elem.setAttribute(GSXML.NAME_ATT, facet.getName());
+    
+                    for (FacetField.Count count : facet.getValues())
+                    {
+                        if (count.getCount() > 0)
+                        {
+                            Element count_elem = this.doc.createElement(GSXML.COUNT_ELEM);
+                            count_elem.setAttribute(GSXML.NAME_ATT, count.getName());
+                            count_elem.setTextContent("" + count.getCount());
+    
+                            facet_elem.appendChild(count_elem);
+                        }
+                    }
+                    facet_list.appendChild(facet_elem);
+                }
+            }
+        }
+
         return result;