Return-Path: Delivered-To: apmail-lucene-java-user-archive@www.apache.org Received: (qmail 38047 invoked from network); 29 Apr 2008 15:06:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Apr 2008 15:06:53 -0000 Received: (qmail 97628 invoked by uid 500); 29 Apr 2008 15:06:47 -0000 Delivered-To: apmail-lucene-java-user-archive@lucene.apache.org Received: (qmail 97594 invoked by uid 500); 29 Apr 2008 15:06:47 -0000 Mailing-List: contact java-user-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-user@lucene.apache.org Delivered-To: mailing list java-user@lucene.apache.org Received: (qmail 97583 invoked by uid 99); 29 Apr 2008 15:06:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2008 08:06:47 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of williams.tricia@gmail.com designates 64.233.170.185 as permitted sender) Received: from [64.233.170.185] (HELO rn-out-0910.google.com) (64.233.170.185) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2008 15:06:00 +0000 Received: by rn-out-0910.google.com with SMTP id j40so52773rnf.4 for ; Tue, 29 Apr 2008 08:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding; bh=2tguJgBszivx0SpAk/hgyf06YPB0xMtYAs0j0Z8bkSE=; b=IjQRT26VtFsHWOCsVXV55rGGLxq5nSozFXJn8HeXGKxHbuS86OG7pmrPiWWDLft3dco16gs+7Ay1eNmEQoieFPaSIPOxC1+2iGmadxEhxKQFZtsIp6n8v07OJ3/BoIjAfYC1JJWJbAUdjWnRHzWn67HVRBZC4wrNB0T3ciplh4w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding; b=qvj8dJchvsjtpOheconS17ieNXSroR1OoOtjYuIlWqqV9F/pX8M6P6Saa8Ilf07+owudGl9M3TGUvU2XAD47Sqlk9wXE/Ql1Diq5lQD+fS1K/u036UC4b5xsgebkFX40tA64fnXF5zKuVlk4uxSTV89hCJ1MtZg0cKPc/4aa3PU= Received: by 10.114.184.7 with SMTP id h7mr8005263waf.28.1209481572863; Tue, 29 Apr 2008 08:06:12 -0700 (PDT) Received: from ?192.168.1.72? ( [204.191.52.10]) by mx.google.com with ESMTPS id j34sm14119057waf.29.2008.04.29.08.06.10 (version=SSLv3 cipher=RC4-MD5); Tue, 29 Apr 2008 08:06:11 -0700 (PDT) Message-ID: <48173960.6070201@gmail.com> Date: Tue, 29 Apr 2008 09:06:08 -0600 From: Tricia Williams User-Agent: Thunderbird 2.0.0.12 (X11/20080227) MIME-Version: 1.0 To: java-user@lucene.apache.org, maurizio316@interfree.it Subject: Re: applying patches (was [jira] Commented: (LUCENE-794) Extend contrib Highlighter to properly support PhraseQuery, SpanQuery, ConstantScoreRangeQuery) References: <1327513741.1209480236944.JavaMail.jira@brutus> In-Reply-To: <1327513741.1209480236944.JavaMail.jira@brutus> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Hi Maurizio, I'm replying in java-user because I believe this is the appropriate place for a question like this. All the patches that I have encountered (including this one) are usually applied at the root. One should download the source code from http://svn.apache.org/repos/asf/lucene/java/trunk/. From the trunk directory all you should need to apply is the most recent patch: SpanHighlighter-02-10-2008.patch. The syntax for applying patches is typically: patch -p 0 -i [--dry-run] where the dry-run flag allows you to see if the patch applies cleanly without gumming up your source. Hope that helps, Tricia Maurizio (JIRA) wrote: > [ https://issues.apache.org/jira/browse/LUCENE-794?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12593030#action_12593030 ] > > Maurizio commented on LUCENE-794: > --------------------------------- > > Hi, > probably I'm missing something, I'm not sure this is the right place to ask my question, but I can't understand how patch mechanism works. > First, I downloaded source code from http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/highlighter/, then I tried to apply every patches listed above. > I wrote a trivial bash script for apply patches (I'm assuming that these one are not cumulative patch), but unsuccessfully. > > thanks in advance... > > Maurizio > > > patch.sh > /*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ > #!/bin/sh > patch -p2 < spanhighlighter.patch > patch -p2 < spanhighlighter2.patch > patch -p2 < spanhighlighter3.patch > patch -p2 < spanhighlighter4.patch > unzip spanhighlighter_patch_4.zip > mv index src/java/org/apache/lucene/ > patch -p2 < spanhighlighter5.patch > patch -p2 < spanhighlighter6.patch > patch -p2 < spanhighlighter7.patch > patch -p2 < spanhighlighter8.patch > patch -p2 < spanhighlighter9.patch > patch -p2 < spanhighlighter10.patch > patch -p2 < spanhighlighter11.patch > patch -p2 < spanhighlighter12.patch > patch -p2 < spanhighlighter_24_January_2008.patch > patch -p2 < SpanHighlighter-01-26-2008.patch > patch -p2 < SpanHighlighter-01-28-2008.patch > patch -p2 < MultiPhraseQueryExtraction.patch > patch -p2 < SpanHighlighter-02-10-2008.patch > patch -p2 < MultiPhraseQueryExtraction.patch > > output > /*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 succeeded at 18 with fuzz 1 (offset 17 lines). > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/Highlighter.java > Hunk #1 FAILED at 222. > Hunk #2 succeeded at 257 (offset 2 lines). > 1 out of 2 hunks FAILED -- saving rejects to file src/java/org/apache/lucene/search/highlight/Highlighter.java.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QueryScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/Scorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/HighlighterTest.java > Hunk #1 succeeded at 460 (offset 7 lines). > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/Highlighter.java > Hunk #1 FAILED at 222. > Hunk #2 FAILED at 255. > 2 out of 2 hunks FAILED -- saving rejects to file src/java/org/apache/lucene/search/highlight/Highlighter.java.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QueryScorer.java > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] y > Hunk #1 FAILED at 104. > 1 out of 1 hunk FAILED -- saving rejects to file src/java/org/apache/lucene/search/highlight/QueryScorer.java.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/Scorer.java > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] y > Hunk #1 FAILED at 36. > 1 out of 1 hunk FAILED -- saving rejects to file src/java/org/apache/lucene/search/highlight/Scorer.java.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/HighlighterTest.java > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] y > Hunk #1 FAILED at 460. > 1 out of 1 hunk FAILED -- saving rejects to file src/test/org/apache/lucene/search/highlight/HighlighterTest.java.rej > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > Archive: spanhighlighter_patch_4.zip > creating: index/ > inflating: index/TermFieldModifier.java > replace spanhighlighter4.patch? [y]es, [n]o, [A]ll, [N]one, [r]ename: y > inflating: spanhighlighter4.patch > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/CachedTokenStream.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/QuerySpansExtractor.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > patching file src/test/org/apache/lucene/search/highlight/SpanHighlighterTest.java > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/HighlighterTest.java > Hunk #3 FAILED at 68. > 1 out of 3 hunks FAILED -- saving rejects to file src/test/org/apache/lucene/search/highlight/HighlighterTest.java.rej > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/HighlighterTest.java > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] y > Hunk #1 FAILED at 21. > Hunk #2 FAILED at 56. > Hunk #3 FAILED at 68. > 3 out of 3 hunks FAILED -- saving rejects to file src/test/org/apache/lucene/search/highlight/HighlighterTest.java.rej > can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > |index d46f5c2..d456f59 100644 > |--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > |+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > -------------------------- > File to patch: > Skip this patch? [y] y > Skipping patch. > 2 out of 2 hunks ignored > can't find file to patch at input line 76 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java b/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > |index 59179d4..a0f9a7b 100644 > |--- a/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > |+++ b/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > -------------------------- > File to patch: > Skip this patch? [y] y > Skipping patch. > 3 out of 3 hunks ignored > (Stripping trailing CRs from patch.) > patching file build.xml > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file build.xml.rej > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/spanscorer.html > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/SpanScorer.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java > (Stripping trailing CRs from patch.) > patching file src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > (Stripping trailing CRs from patch.) > patching file src/test/org/apache/lucene/search/highlight/HighlighterTest.java > Hunk #1 FAILED at 21. > Hunk #2 FAILED at 69. > 2 out of 2 hunks FAILED -- saving rejects to file src/test/org/apache/lucene/search/highlight/HighlighterTest.java.rej > can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > |index d46f5c2..d456f59 100644 > |--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > |+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java > -------------------------- > File to patch: > Skip this patch? [y] y > Skipping patch. > 2 out of 2 hunks ignored > can't find file to patch at input line 76 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java b/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > |index 59179d4..a0f9a7b 100644 > |--- a/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > |+++ b/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java > -------------------------- > File to patch: > Skip this patch? [y] y > Skipping patch. > 3 out of 3 hunks ignored > /*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ > > > > >> Extend contrib Highlighter to properly support PhraseQuery, SpanQuery, ConstantScoreRangeQuery >> ----------------------------------------------------------------------------------------------- >> >> Key: LUCENE-794 >> URL: https://issues.apache.org/jira/browse/LUCENE-794 >> Project: Lucene - Java >> Issue Type: Improvement >> Components: Other >> Reporter: Mark Miller >> Priority: Minor >> Attachments: MultiPhraseQueryExtraction.patch, SpanHighlighter-01-26-2008.patch, SpanHighlighter-01-28-2008.patch, SpanHighlighter-02-10-2008.patch, spanhighlighter.patch, spanhighlighter10.patch, spanhighlighter11.patch, spanhighlighter12.patch, spanhighlighter2.patch, spanhighlighter3.patch, spanhighlighter5.patch, spanhighlighter6.patch, spanhighlighter7.patch, spanhighlighter8.patch, spanhighlighter9.patch, spanhighlighter_24_January_2008.patch, spanhighlighter_patch_4.zip >> >> >> This patch adds a new Scorer class (SpanQueryScorer) to the Highlighter package that scores just like QueryScorer, but scores a 0 for Terms that did not cause the Query hit. This gives 'actual' hit highlighting for the range of SpanQuerys, PhraseQuery, and ConstantScoreRangeQuery. New Query types are easy to add. There is also a new Fragmenter that attempts to fragment without breaking up Spans. >> See http://issues.apache.org/jira/browse/LUCENE-403 for some background. >> There is a dependency on MemoryIndex. >> > > --------------------------------------------------------------------- To unsubscribe, e-mail: java-user-unsubscribe@lucene.apache.org For additional commands, e-mail: java-user-help@lucene.apache.org