Changeset 25931

Timestamp:

2012-07-11T12:04:39+12:00 (11 years ago)

Author:

sjm84

Message:

Some tidying and making Solr return some basic query information (the total docs found)

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java (modified) (5 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java

@@ -145 +145 @@
                     int colonIndex = currentQueryElement.indexOf(":");
                     String indexShortName = currentQueryElement.substring(0, colonIndex);
-                    
-                    if(grouping.get(indexShortName) == null)
+
+                    if (grouping.get(indexShortName) == null)
                     {
                         grouping.put(indexShortName, new ArrayList<String>());
@@ -161 +161 @@
                 StringBuilder currentFacetString = new StringBuilder("(");
                 int groupCounter = 0;
-                for(String queryElem : grouping.get(key))
+                for (String queryElem : grouping.get(key))
                 {
                     currentFacetString.append(queryElem);
-                    
+
                     groupCounter++;
-                    if(groupCounter < grouping.get(key).size())
+                    if (groupCounter < grouping.get(key).size())
                     {
                         currentFacetString.append(" OR ");
@@ -172 +172 @@
                 }
                 currentFacetString.append(")");
-                
+
                 facetQueryString.append(currentFacetString);
-                
+
                 keysetCounter++;
-                if(keysetCounter < grouping.keySet().size())
+                if (keysetCounter < grouping.keySet().size())
                 {
                     facetQueryString.append(" AND ");
                 }
             }
-            
-            if(facetQueryString.length() > 0)
+
+            if (facetQueryString.length() > 0)
             {
                 query_string += " AND " + facetQueryString;
@@ -193 +193 @@
         solrParams.set("rows", (end_results - start_results) + 1);
         solrParams.set("fl", "docOID score");
-        
+        solrParams.set("terms", true);
+        solrParams.set("terms.fl", "ZZ");
+
         if (_facets.size() > 0)
         {
@@ -224 +226 @@
                 solr_query_result.setStartResults(start_results);
                 solr_query_result.setEndResults(start_results + hits.size());
+
+                int sepIndex = query_string.indexOf(":");
+                String field = query_string.substring(0, sepIndex);
+                String query = query_string.substring(sepIndex + 2, query_string.length() - 1);
+
+                solr_query_result.addTerm(query, field, (int) hits.getNumFound(), -1);
 
                 // Output the matching documents