From commits-return-13653-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Sep 17 15:28:38 2012 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4ED30D4F4 for ; Mon, 17 Sep 2012 15:28:38 +0000 (UTC) Received: (qmail 94268 invoked by uid 500); 17 Sep 2012 15:28:38 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 94175 invoked by uid 500); 17 Sep 2012 15:28:38 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 94168 invoked by uid 99); 17 Sep 2012 15:28:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Sep 2012 15:28:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 17 Sep 2012 15:28:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C7D7023888FE; Mon, 17 Sep 2012 15:27:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1386659 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/query/lucene/ test/java/org/apache/jackrabbit/core/query/ Date: Mon, 17 Sep 2012 15:27:53 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120917152753.C7D7023888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Mon Sep 17 15:27:53 2012 New Revision: 1386659 URL: http://svn.apache.org/viewvc?rev=1386659&view=rev Log: Partial search terms are no longer highlighted in the excerpts Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CaseTermQuery.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CaseTermQuery.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CaseTermQuery.java?rev=1386659&r1=1386658&r2=1386659&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CaseTermQuery.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CaseTermQuery.java Mon Sep 17 15:27:53 2012 @@ -47,7 +47,7 @@ abstract class CaseTermQuery extends Mul CaseTermQuery(Term term, int transform) { this.term = term; this.transform = transform; - setRewriteMethod(CONSTANT_SCORE_FILTER_REWRITE); + setRewriteMethod(CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); } /** Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java?rev=1386659&r1=1386658&r2=1386659&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java Mon Sep 17 15:27:53 2012 @@ -198,7 +198,7 @@ public class WildcardQuery extends Query this.tvf = tvf; this.pattern = pattern; this.transform = transform; - setRewriteMethod(CONSTANT_SCORE_FILTER_REWRITE); + setRewriteMethod(CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); } @Override Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java?rev=1386659&r1=1386658&r2=1386659&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java Mon Sep 17 15:27:53 2012 @@ -239,6 +239,34 @@ public class ExcerptTest extends Abstrac checkExcerpt(content, expectedExcerpt, jTest); } + /** + * test for https://issues.apache.org/jira/browse/JCR-3428 + * + * when given an incomplete fulltext search token, the excerpt should + * highlight the entire matching token + * + */ + public void testEagerMatch() throws RepositoryException { + checkExcerpt("lorem ipsum dolor sit amet", + "lorem ipsum dolor sit amet", "ipsu*"); + } + + /** + * @see #testEagerMatch() + */ + public void testEagerMatch2() throws RepositoryException { + checkExcerpt("lorem ipsum dolor sit amet", + "lorem ipsum dolor sit amet", + "lorem ipsu*"); + } + + /** + * @see #testEagerMatch() + */ + public void testEagerMatch3() throws RepositoryException { + checkExcerpt("lorem ipsum dolor sit amet", + "lorem ipsum dolor sit amet", "ipsu* dolor"); + } private void checkExcerpt(String text, String fragmentText, String terms) throws RepositoryException {