lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r907700 - in /lucene/solr/trunk/src: common/org/apache/solr/common/params/ java/org/apache/solr/highlight/ test/org/apache/solr/highlight/
Date Mon, 08 Feb 2010 15:46:15 GMT
Author: koji
Date: Mon Feb  8 15:46:15 2010
New Revision: 907700

URL: http://svn.apache.org/viewvc?rev=907700&view=rev
Log:
SOLR-1268: 1. eliminate hl.useHighlighter parameter. 2. introduce hl.useFastVectorHighlighter
parameter. The default is false.

Modified:
    lucene/solr/trunk/src/common/org/apache/solr/common/params/HighlightParams.java
    lucene/solr/trunk/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
    lucene/solr/trunk/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
    lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java

Modified: lucene/solr/trunk/src/common/org/apache/solr/common/params/HighlightParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/common/org/apache/solr/common/params/HighlightParams.java?rev=907700&r1=907699&r2=907700&view=diff
==============================================================================
--- lucene/solr/trunk/src/common/org/apache/solr/common/params/HighlightParams.java (original)
+++ lucene/solr/trunk/src/common/org/apache/solr/common/params/HighlightParams.java Mon Feb
 8 15:46:15 2010
@@ -41,7 +41,7 @@
 
   public static final String MERGE_CONTIGUOUS_FRAGMENTS = HIGHLIGHT + ".mergeContiguous";
 
-  public static final String USE_HIGHLIGHTER = HIGHLIGHT + ".useHighlighter";
+  public static final String USE_FVH = HIGHLIGHT + ".useFastVectorHighlighter";
   
   // Formatter
   public static final String SIMPLE = "simple";

Modified: lucene/solr/trunk/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=907700&r1=907699&r2=907700&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Mon Feb
 8 15:46:15 2010
@@ -355,7 +355,7 @@
     return schemaField != null &&
       schemaField.storeTermPositions() &&
       schemaField.storeTermOffsets() &&
-      !params.getFieldBool( fieldName, HighlightParams.USE_HIGHLIGHTER, false );
+      params.getFieldBool( fieldName, HighlightParams.USE_FVH, false );
   }
   
   private void doHighlightingByHighlighter( Query query, SolrQueryRequest req, NamedList
docSummaries,

Modified: lucene/solr/trunk/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java?rev=907700&r1=907699&r2=907700&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java Mon
Feb  8 15:46:15 2010
@@ -54,6 +54,7 @@
     args.put("hl", "true");
     args.put("hl.fl", "tv_text");
     args.put("hl.snippets", "2");
+    args.put("hl.useFastVectorHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard",0,200,args);
     

Modified: lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=907700&r1=907699&r2=907700&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java Mon Feb  8 15:46:15
2010
@@ -134,7 +134,6 @@
     args.put("hl", "true");
     args.put("hl.fl", "tv_text");
     args.put("hl.snippets", "2");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard",0,200,args);
     
@@ -175,7 +174,6 @@
     args.put("hl", "true");
     args.put("hl.fl", "tv_mv_text");
     args.put("hl.snippets", "2");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard",0,200,args);
     
@@ -202,7 +200,6 @@
     args.put("hl", "true");
     args.put("hl.fl", "tv_mv_text");
     args.put("hl.snippets", "2");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard",0,200,args);
 
@@ -228,7 +225,6 @@
     args.put("hl.fl", "tv_text");
     args.put("qf", "tv_text");
     args.put("q.alt", "*:*");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "dismax",0,200,args);
     
@@ -340,7 +336,6 @@
     HashMap<String,String> args = new HashMap<String,String>();
     args.put("hl", "true");
     args.put("hl.fl", "t_text tv_text");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard", 0, 200, args);
     
@@ -441,7 +436,6 @@
     HashMap<String,String> args = new HashMap<String,String>();
     args.put("hl", "true");
     args.put("hl.fl", "tv_text");
-    args.put("hl.useHighlighter", "true");
     TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
       "standard", 0, 200, args);
     
@@ -540,7 +534,6 @@
      HashMap<String,String> args = new HashMap<String,String>();
      args.put("hl", "true");
      args.put("hl.fl", "tv_text");
-     args.put("hl.useHighlighter", "true");
      TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
        "standard", 0, 200, args);
      assertQ("Basic summarization",



Mime
View raw message