[maven-release-plugin] copy for tag maven-indexer-5.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/indexer/tags/maven-indexer-5.1.0@1411595 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
index b64dfed..85410d8 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIteratorResultSet.java
@@ -110,6 +110,13 @@
this.matchHighlightRequests = request.getMatchHighlightRequests();
+ List<MatchHighlightRequest> matchHighlightRequests = new ArrayList<MatchHighlightRequest>();
+ for ( MatchHighlightRequest hr : request.getMatchHighlightRequests() )
+ {
+ Query rewrittenQuery = hr.getQuery().rewrite( indexSearcher.getIndexReader() );
+ matchHighlightRequests.add( new MatchHighlightRequest( hr.getField(), rewrittenQuery, hr.getHighlightMode() ) );
+ }
+
this.hits = hits;
this.from = request.getStart();
@@ -358,8 +365,6 @@
text = text.replace( '/', '.' ).replaceAll( "^\\.", "" ).replaceAll( "\n\\.", "\n" );
}
- Query rewrittenQuery = hr.getQuery().rewrite( indexSearcher.getIndexReader() );
-
CachingTokenFilter tokenStream =
new CachingTokenFilter( context.getAnalyzer().tokenStream( field.getKey(), new StringReader( text ) ) );
@@ -376,7 +381,7 @@
+ "\" is not supported!" );
}
- return getBestFragments( rewrittenQuery, formatter, tokenStream, text, 3 );
+ return getBestFragments( hr.getQuery(), formatter, tokenStream, text, 3 );
}
protected final List<String> getBestFragments( Query query, Formatter formatter, TokenStream tokenStream,
