koji, I think you broke the build here can you fix that please simon
On Wed, Jan 18, 2012 at 8:34 AM, <[email protected]> wrote: > Author: koji > Date: Wed Jan 18 07:34:56 2012 > New Revision: 1232769 > > URL: http://svn.apache.org/viewvc?rev=1232769&view=rev > Log: > LUCENE-3697: SimpleBoundaryScanner does not work well when highlighting at > the beginning of the text > > Modified: > lucene/dev/trunk/lucene/contrib/CHANGES.txt > > lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java > > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java > > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java > > Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt > URL: > http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1232769&r1=1232768&r2=1232769&view=diff > ============================================================================== > --- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original) > +++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Wed Jan 18 07:34:56 2012 > @@ -189,6 +189,9 @@ Bug Fixes > * LUCENE-3686: CategoryEnhancement must override Object.equals(Object). > (Sivan Yogev via Shai Erera) > > + * LUCENE-3697: SimpleBoundaryScanner does not work well when highlighting > + at the beginning of the text. (Shay Banon via Koji Sekiguchi) > + > Documentation > > * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly > > Modified: > lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java > URL: > http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java?rev=1232769&r1=1232768&r2=1232769&view=diff > ============================================================================== > --- > lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java > (original) > +++ > lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java > Wed Jan 18 07:34:56 2012 > @@ -61,6 +61,10 @@ public class SimpleBoundaryScanner imple > if( boundaryChars.contains( buffer.charAt( offset - 1 ) ) ) return > offset; > offset--; > } > + // if we scanned up to the start of the text, return it, its a "boundary" > + if (offset == 0) { > + return 0; > + } > // not found > return start; > } > > Modified: > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java > URL: > http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java?rev=1232769&r1=1232768&r2=1232769&view=diff > ============================================================================== > --- > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java > (original) > +++ > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java > Wed Jan 18 07:34:56 2012 > @@ -36,6 +36,10 @@ public class SimpleBoundaryScannerTest e > start = TEXT.indexOf("formance"); > int expected = TEXT.indexOf("high-performance"); > assertEquals(expected, scanner.findStartOffset(text, start)); > + > + start = TEXT.indexOf("che"); > + expected = TEXT.indexOf("Apache"); > + assertEquals(expected, scanner.findStartOffset(text, start)); > } > > public void testFindEndOffset() throws Exception { > > Modified: > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java > URL: > http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1232769&r1=1232768&r2=1232769&view=diff > ============================================================================== > --- > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java > (original) > +++ > lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java > Wed Jan 18 07:34:56 2012 > @@ -173,6 +173,6 @@ public class SimpleFragmentsBuilderTest > FieldFragList ffl = sflb.createFieldFragList( fpl, 100 ); > SimpleFragmentsBuilder sfb = new SimpleFragmentsBuilder(); > sfb.setMultiValuedSeparator( '/' ); > - assertEquals( " b c//<b>d</b> e", sfb.createFragment( reader, 0, F, ffl > ) ); > + assertEquals( "//a b c//<b>d</b> e", sfb.createFragment( reader, 0, F, > ffl ) ); > } > } > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
