Changeset 31858

Timestamp:

2017-08-08T01:40:17+12:00 (6 years ago)

Author:

Georgiy Litvinov

Message:

Due to slow search queries on on big documents with standard Solr highlighter switched to FastVectorHighlighter.

Location:

gs3-extensions/solr/trunk/src

Files:

• perllib/solrbuilder.pm (modified) (1 diff)
• src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java (modified) (2 diffs)

gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

@@ -309 +309 @@
         # set termVectors=\"true\" when term vectors info is required, 
         # see TermsResponse termResponse = solrResponse.getTermsResponse(); 
-        #$schema_insert_xml .=  "indexed=\"true\" stored=\"false\" termVectors=\"true\" multiValued=\"true\" />\n";
-        $schema_insert_xml .=  "indexed=\"true\" stored=\"true\" multiValued=\"true\" />\n";
-                #$schema_insert_xml .=  "indexed=\"true\" stored=\"true\" multiValued=\"true\" />\n";
+        $schema_insert_xml .=  "indexed=\"true\" stored=\"true\" multiValued=\"true\" termVectors=\"true\" termPositions=\"true\" termOffsets=\"true\" />\n";
     }
 

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

@@ -366 +366 @@
         //Return 3 snippets for each document
         solrQuery.setParam("hl.snippets", "3");
+        solrQuery.setParam("hl.useFastVectorHighlighter", "true");
         solrQuery.setParam("hl.fl", highlight_field);
-        solrQuery.setHighlightSimplePre("<span class=\"snippetText\">");
-        
-        //Set text which appears after highlighted term
-        solrQuery.setHighlightSimplePost("</span>");
+        solrQuery.setParam("hl.tag.pre", "<span class=\"snippetText\">" );
+        solrQuery.setParam("hl.tag.post","</span>" );
         
         //solrQuery.setTerms(true); // turn on the termsComponent       
@@ -545 +544 @@
         solrQuery.setFilterQueries("docOID:"+ hldocOID);
         
-        //Set text which appears before highlighted term
-        //solrQuery.setHighlightSimplePre("<annotation type=\"query_term\">");
         solrQuery.setHighlightSimplePre("<span class=\"termHighlight\">");
-        //Set text which appears after highlighted term
-        //solrQuery.setHighlightSimplePost("</annotation>");
         solrQuery.setHighlightSimplePost("</span>");
+        
         //Prepare results
         String text = null;