Changeset 25886

Timestamp:

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

Author:

sjm84

Message:

Some fixes to remove the Solr code from the main Greenstone code

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3

Files:

• service/GS2SolrSearch.java (modified) (7 diffs)
• util/SolrFacetWrapper.java (added)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -24 +24 @@
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -30 +31 @@
 import org.apache.log4j.Logger;
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.core.CoreContainer;
 import org.greenstone.LuceneWrapper3.SharedSoleneQueryResult;
+import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.SolrFacetWrapper;
+import org.greenstone.gsdl3.util.SolrQueryResult;
 import org.greenstone.gsdl3.util.SolrQueryWrapper;
 import org.greenstone.util.GlobalProperties;
@@ -52 +57 @@
     public GS2SolrSearch()
     {
+        does_faceting = true;
         // Used to store the solr cores that match the required 'level' 
         // of search (e.g. either document-level=>didx, or 
@@ -102 +108 @@
             }
         }
-        
+
         Element indexListElem = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_ELEM + GSXML.LIST_MODIFIER);
         NodeList buildIndexElems = indexListElem.getElementsByTagName(GSXML.INDEX_ELEM);
 
-        for(int j = 0; j < buildIndexElems.getLength(); j++)
+        for (int j = 0; j < buildIndexElems.getLength(); j++)
         {
             Element current = (Element) buildIndexElems.item(j);
-            for(int i = 0; i < chosenFacets.size(); i++)
+            for (int i = 0; i < chosenFacets.size(); i++)
             {
                 if (current.getAttribute(GSXML.NAME_ATT).equals(chosenFacets.get(i)))
@@ -117 +123 @@
             }
         }
-        
+
         return true;
     }
@@ -250 +256 @@
 
         String core_name = site_name + "-" + coll_name + "-" + index;
-        
+
         EmbeddedSolrServer solr_core = null;
 
@@ -350 +356 @@
     }
 
+    protected ArrayList<FacetWrapper> getFacets(Object query_result)
+    {
+        if (!(query_result instanceof SolrQueryResult))
+        {
+            return null;
+        }
+
+        SolrQueryResult result = (SolrQueryResult) query_result;
+        List<FacetField> facets = result.getFacetResults();
+
+        if (facets == null)
+        {
+            return null;
+        }
+
+        ArrayList<FacetWrapper> newFacetList = new ArrayList<FacetWrapper>();
+
+        for (FacetField facet : facets)
+        {
+            newFacetList.add(new SolrFacetWrapper(facet));
+        }
+
+        return newFacetList;
+    }
 }