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

Timestamp:

2015-07-21T05:35:34+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

Solr repo modifications for Solr side highlighing and snippets

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java (modified) (4 diffs)

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

@@ -65 +65 @@
                 paramDefaults.put(SORT_ORDER_PARAM, SORT_ORDER_DESCENDING);
         does_faceting = true;
+        does_highlight_snippets = true;
+        does_full_field_highlighting = true;
         // Used to store the solr cores that match the required 'level' 
         // of search (e.g. either document-level=>didx, or 
@@ -341 +343 @@
         try
         {
+            //if it is a Highlighting Query - execute it
+            this.solr_src.setHighlightField(indexField);
+            if(hldocOID != null)
+            {
+                String rslt = this.solr_src.runHighlightingQuery(query,hldocOID);
+                return rslt;
+            }
             SharedSoleneQueryResult sqr = this.solr_src.runQuery(query);
 
@@ -352 +361 @@
         return null;
     }
-
+    
+    
     /** get the total number of docs that match */
     protected long numDocsMatched(Object query_result)
@@ -445 +455 @@
 
         return newFacetList;
+    }
+    @Override
+    protected Map<String, Map<String, List<String>>> getHighlightSnippets(Object query_result)
+    {
+        if (!(query_result instanceof SolrQueryResult))
+        {
+            return null;
+        }
+
+        SolrQueryResult result = (SolrQueryResult) query_result;
+        
+        return result.getHighlightResults();
     }