Changeset 25885

Timestamp:

2012-06-28T16:35:14+12:00 (11 years ago)

Author:

sjm84

Message:

Removed the Solr code from the main greenstone code

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• service/AbstractGS2FieldSearch.java (modified) (4 diffs)
• service/AbstractSearch.java (modified) (1 diff)
• service/GS2LuceneSearch.java (modified) (3 diffs)
• service/GS2MGPPSearch.java (modified) (3 diffs)
• util/FacetWrapper.java (added)

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

@@ -305 +305 @@
                     createParameter(INDEX_LANGUAGE_PARAM, param_list, lang);
                 }
-                
+
                 if (does_paging)
                 {
@@ -311 +311 @@
                     createParameter(START_PAGE_PARAM, param_list, lang);
                 }
-                
+
                 // create a multi param for the fields etc
                 // text box, field
@@ -665 +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())
+        if(does_faceting)
+        {
+            ArrayList<FacetWrapper> facets = getFacets(query_result);
+            if(facets != null)
+            {
+                Element facet_list = this.doc.createElement(GSXML.FACET_ELEM + GSXML.LIST_MODIFIER);
+                result.appendChild(facet_list);
+
+                for(FacetWrapper currentFacet : facets)
                 {
                     Element facet_elem = this.doc.createElement(GSXML.FACET_ELEM);
-                    facet_elem.setAttribute(GSXML.NAME_ATT, facet.getName());
-    
-                    for (FacetField.Count count : facet.getValues())
+                    facet_elem.setAttribute(GSXML.NAME_ATT, currentFacet.getName());
+                    facet_list.appendChild(facet_elem);
+                    
+                    HashMap<String, Long> countMap = currentFacet.getCounts();
+                    
+                    for(String countName : countMap.keySet())
                     {
-                        if (count.getCount() > 0)
+                        long countValue = countMap.get(countName);
+                        if(countValue > 0)
                         {
                             Element count_elem = this.doc.createElement(GSXML.COUNT_ELEM);
-                            count_elem.setAttribute(GSXML.NAME_ATT, count.getName());
-                            count_elem.setTextContent("" + count.getCount());
-    
+                            count_elem.setAttribute(GSXML.NAME_ATT, countName);
+                            count_elem.setTextContent("" + countValue);
+
                             facet_elem.appendChild(count_elem);
                         }
                     }
-                    facet_list.appendChild(facet_elem);
                 }
             }
@@ -712 +716 @@
     /** get the list of doc ranks */
     abstract protected String[] getDocRanks(Object query_result);
+    
+    /** get the list of facets */
+    abstract protected ArrayList<FacetWrapper> getFacets(Object query_result);
 
     /** add in term info if available */

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

@@ -62 +62 @@
     /** does this service support asking for a subset of results? */
     protected boolean does_chunking = false;
+    /** does this service support faceting search results */
+    protected boolean does_faceting = false;
     /**
      * the default document type - use if all documents are the same type

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

@@ -21 +21 @@
 // Greenstone classes
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30 +31 @@
 import org.greenstone.LuceneWrapper3.GS2LuceneQuery;
 import org.greenstone.LuceneWrapper3.LuceneQueryResult;
+import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -229 +231 @@
         return true;
     }
+    
+    protected ArrayList<FacetWrapper> getFacets(Object query_result)
+    {
+        return null;
+    }
 }

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

@@ -21 +21 @@
 import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28 +29 @@
 
 import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -336 +338 @@
     }
 
+    protected ArrayList<FacetWrapper> getFacets(Object query_result)
+    {
+        return null;
+    }
 }