You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by kl...@apache.org on 2007/07/04 01:44:32 UTC
svn commit: r553023 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/highlight/SolrHighlighter.java
src/test/org/apache/solr/highlight/HighlighterTest.java
Author: klaas
Date: Tue Jul 3 16:44:31 2007
New Revision: 553023
URL: http://svn.apache.org/viewvc?view=rev&rev=553023
Log:
added hl.maxAnalyzedChars highlighting parameter (SOLR-273)
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java
lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?view=diff&rev=553023&r1=553022&r2=553023
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Tue Jul 3 16:44:31 2007
@@ -92,6 +92,8 @@
14. SOLR-225: Enable pluggable highlighting classes. Allow configurable
highlighting formatters and Fragmenters. (ryan)
+15. SOLR-273: Added hl.maxAnalyzedChars highlighting parameter, defaulting to
+ 50k (klaas)
Changes in runtime behavior
Modified: lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java?view=diff&rev=553023&r1=553022&r2=553023
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java Tue Jul 3 16:44:31 2007
@@ -118,7 +118,10 @@
getFormatter(fieldName, params),
getQueryScorer(query, fieldName, request));
highlighter.setTextFragmenter(getFragmenter(fieldName, params));
- return highlighter;
+ highlighter.setMaxDocBytesToAnalyze(params.getFieldInt(
+ fieldName, HighlightParams.MAX_CHARS,
+ Highlighter.DEFAULT_MAX_DOC_BYTES_TO_ANALYZE));
+ return highlighter;
}
/**
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?view=diff&rev=553023&r1=553022&r2=553023
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java Tue Jul 3 16:44:31 2007
@@ -30,6 +30,8 @@
*/
public class HighlighterTest extends AbstractSolrTestCase {
+ private static String LONG_TEXT = "a long days night this should be a piece of text which is is is is is is is is is is is is is is is is is is is is is is is is isis is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is sufficiently lengthly to produce multiple fragments which are not concatenated at all--we want two disjoint long fragments.";
+
@Override public String getSchemaFile() { return "schema.xml"; }
@Override public String getSolrConfigFile() { return "solrconfig.xml"; }
@@ -78,7 +80,7 @@
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
"standard",0,200,args);
- assertU(adoc("tv_text", "a long days night this should be a piece of text which is is is is is is is is is is is is is is is is is is is is is is is is isis is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is sufficiently lengthly to produce multiple fragments which are not concatenated at all--we want two disjoint long fragments.",
+ assertU(adoc("tv_text", LONG_TEXT,
"id", "1"));
assertU(commit());
assertU(optimize());
@@ -284,7 +286,33 @@
"//lst[@name='1']/arr[@name='tv_text']/str"
);
}
-
+
+ public void testMaxChars() {
+ HashMap<String,String> args = new HashMap<String,String>();
+ args.put("fl", "id score");
+ args.put("hl", "true");
+ args.put("hl.snippets", "10");
+ args.put("hl.fl", "t_text");
+ TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
+ "standard", 0, 200, args);
+
+
+ assertU(adoc("t_text", LONG_TEXT, "id", "1"));
+ assertU(commit());
+ assertU(optimize());
+ assertQ("token at start of text",
+ sumLRF.makeRequest("t_text:disjoint"),
+ "//lst[@name='highlighting']/lst[@name='1']",
+ "//lst[@name='1']/arr[count(str)=1]"
+ );
+ args.put("hl.maxAnalyzedChars", "20");
+ sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ assertQ("token at end of text",
+ sumLRF.makeRequest("t_text:disjoint"),
+ "//lst[@name='highlighting']/lst[@name='1']",
+ "//lst[@name='1'][not(*)]"
+ );
+ }
public void testVariableFragsize() {
assertU(adoc("tv_text", "a long days night this should be a piece of text which is is is is is is is is is is is is is is is is is is is is is is is is isis is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is is sufficiently lengthly to produce multiple fragments which are not concatenated at all",
"id", "1"));