Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 55396 invoked from network); 4 Jul 2010 15:59:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Jul 2010 15:59:51 -0000 Received: (qmail 1628 invoked by uid 500); 4 Jul 2010 15:59:50 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 1616 invoked by uid 99); 4 Jul 2010 15:59:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jul 2010 15:59:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jul 2010 15:59:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFD5A2388980; Sun, 4 Jul 2010 15:58:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r960349 - in /lucene/dev/trunk/lucene/contrib: CHANGES.txt highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Date: Sun, 04 Jul 2010 15:58:54 -0000 To: commits@lucene.apache.org From: koji@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100704155854.AFD5A2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: koji Date: Sun Jul 4 15:58:54 2010 New Revision: 960349 URL: http://svn.apache.org/viewvc?rev=960349&view=rev Log: LUCENE-2524: FastVectorHighlighter: use mod for getting colored tag Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=960349&r1=960348&r2=960349&view=diff ============================================================================== --- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original) +++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Sun Jul 4 15:58:54 2010 @@ -86,6 +86,9 @@ Bug fixes * LUCENE-2404: Fix bugs with position increment and empty tokens in ThaiWordFilter. For matchVersion >= 3.1 the filter also no longer lowercases. ThaiAnalyzer will use a separate LowerCaseFilter instead. (Uwe Schindler, Robert Muir) + +* LUCENE-2524: FastVectorHighlighter: use mod for getting colored tag. + (Koji Sekiguchi) API Changes Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=960349&r1=960348&r2=960349&view=diff ============================================================================== --- lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original) +++ lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Sun Jul 4 15:58:54 2010 @@ -36,7 +36,10 @@ public abstract class BaseFragmentsBuild "", "", "", "", "", "", "", "", "", - "" + "", "", "", + "", "", "", + "", "", "", + "", "" }; public static final String[] COLORED_POST_TAGS = { "" }; @@ -145,10 +148,12 @@ public abstract class BaseFragmentsBuild } protected String getPreTag( int num ){ - return preTags.length > num ? preTags[num] : preTags[0]; + int n = num % preTags.length; + return preTags[n]; } protected String getPostTag( int num ){ - return postTags.length > num ? postTags[num] : postTags[0]; + int n = num % postTags.length; + return postTags[n]; } }