Thanks, Mark!
Can you change "Trunk" to "2.9 branch" in CHANGES.txt? :-)
+======================= Trunk (not yet released) =======================
Koji
markrmil...@apache.org wrote:
Author: markrmiller
Date: Thu Oct 8 14:32:09 2009
New Revision: 823189
URL: http://svn.apache.org/viewvc?rev=823189&view=rev
Log:
LUCENE-1953: FastVectorHighlighter: small fragCharSize can cause
StringIndexOutOfBoundsException
Modified:
lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
Modified: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt?rev=823189&r1=823188&r2=823189&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/CHANGES.txt (original)
+++ lucene/java/branches/lucene_2_9/contrib/CHANGES.txt Thu Oct 8 14:32:09 2009
@@ -1,5 +1,14 @@
Lucene contrib change Log
+======================= Trunk (not yet released) =======================
+
+Changes in backwards compatibility policy
+
+Bug fixes
+
+ * LUCENE-1953: FastVectorHighlighter: small fragCharSize can cause
+ StringIndexOutOfBoundsException. (Koji Sekiguchi)
+
======================= Release 2.9.0 2009-09-23 =======================
Changes in runtime behavior
Modified:
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java?rev=823189&r1=823188&r2=823189&view=diff
==============================================================================
---
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
(original)
+++
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
Thu Oct 8 14:32:09 2009
@@ -59,6 +59,8 @@
int st = phraseInfo.getStartOffset() - MARGIN < startOffset ?
startOffset : phraseInfo.getStartOffset() - MARGIN;
int en = st + fragCharSize;
+ if( phraseInfo.getEndOffset() > en )
+ en = phraseInfo.getEndOffset();
startOffset = en;
while( true ){
Modified:
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
URL:
http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java?rev=823189&r1=823188&r2=823189&view=diff
==============================================================================
---
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
(original)
+++
lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
Thu Oct 8 14:32:09 2009
@@ -37,6 +37,21 @@
}
}
+ public void testSmallerFragSizeThanTermQuery() throws Exception {
+ SimpleFragListBuilder sflb = new SimpleFragListBuilder();
+ FieldFragList ffl = sflb.createFieldFragList( fpl( "abcdefghijklmnopqrs",
"abcdefghijklmnopqrs" ), SimpleFragListBuilder.MIN_FRAG_CHAR_SIZE );
+ assertEquals( 1, ffl.fragInfos.size() );
+ assertEquals( "subInfos=(abcdefghijklmnopqrs((0,19)))/1.0(0,19)",
ffl.fragInfos.get( 0 ).toString() );
+ }
+
+ public void testSmallerFragSizeThanPhraseQuery() throws Exception {
+ SimpleFragListBuilder sflb = new SimpleFragListBuilder();
+ FieldFragList ffl = sflb.createFieldFragList( fpl( "\"abcdefgh jklmnopqrs\"",
"abcdefgh jklmnopqrs" ), SimpleFragListBuilder.MIN_FRAG_CHAR_SIZE );
+ assertEquals( 1, ffl.fragInfos.size() );
+ System.out.println( ffl.fragInfos.get( 0 ).toString() );
+ assertEquals( "subInfos=(abcdefghjklmnopqrs((0,21)))/1.0(0,21)",
ffl.fragInfos.get( 0 ).toString() );
+ }
+
public void test1TermIndex() throws Exception {
SimpleFragListBuilder sflb = new SimpleFragListBuilder();
FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a" ), 100 );
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: java-dev-h...@lucene.apache.org
