[
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.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
