You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by ma...@apache.org on 2009/10/19 21:25:39 UTC
svn commit: r826775 - in /lucene/java/branches/lucene_2_9/contrib:
CHANGES.txt
highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
Author: markrmiller
Date: Mon Oct 19 19:25:38 2009
New Revision: 826775
URL: http://svn.apache.org/viewvc?rev=826775&view=rev
Log:
LUCENE-1929: Highlighter throws exception on NumericRangeQuery and does not support deprecated RangeQuery.
Modified:
lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
lucene/java/branches/lucene_2_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
Modified: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt?rev=826775&r1=826774&r2=826775&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/CHANGES.txt (original)
+++ lucene/java/branches/lucene_2_9/contrib/CHANGES.txt Mon Oct 19 19:25:38 2009
@@ -15,6 +15,9 @@
* LUCENE-1953: FastVectorHighlighter: small fragCharSize can cause
StringIndexOutOfBoundsException. (Koji Sekiguchi)
+
+ * LUCENE-1929: Highlighter throws exception on NumericRangeQuery and does not
+ support deprecated RangeQuery. (Mark Miller)
======================= Release 2.9.0 2009-09-23 =======================
Modified: lucene/java/branches/lucene_2_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=826775&r1=826774&r2=826775&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/java/branches/lucene_2_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Mon Oct 19 19:25:38 2009
@@ -42,6 +42,7 @@
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RangeQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.WildcardQuery;
@@ -141,12 +142,21 @@
mtq.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
query = mtq;
}
- String field;
+ String field = null;
if(mtq instanceof TermRangeQuery) {
field = ((TermRangeQuery)mtq).getField();
} else {
- field = mtq.getTerm().field();
+ Term term = mtq.getTerm();
+ if(term != null) {
+ field = term.field();
+ }
+ }
+ if(field != null) {
+ IndexReader ir = getReaderForField(field);
+ extract(query.rewrite(ir), terms);
}
+ } else if (query instanceof RangeQuery) {
+ String field = ((RangeQuery)query).getField();
IndexReader ir = getReaderForField(field);
extract(query.rewrite(ir), terms);
} else if (query instanceof MultiPhraseQuery) {
Modified: lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=826775&r1=826774&r2=826775&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Oct 19 19:25:38 2009
@@ -45,6 +45,7 @@
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.IndexReader;
@@ -61,8 +62,10 @@
import org.apache.lucene.search.MultiPhraseQuery;
import org.apache.lucene.search.MultiSearcher;
import org.apache.lucene.search.MultiTermQuery;
+import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RangeQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeFilter;
import org.apache.lucene.search.TopDocs;
@@ -87,6 +90,7 @@
public class HighlighterTest extends BaseTokenStreamTestCase implements Formatter {
private IndexReader reader;
static final String FIELD_NAME = "contents";
+ private static final String NUMERIC_FIELD_NAME = "nfield";
private Query query;
RAMDirectory ramDir;
public IndexSearcher searcher = null;
@@ -256,6 +260,30 @@
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 3);
}
+
+ public void testNumericRangeQuery() throws Exception {
+ // doesn't currently highlight, but make sure it doesn't cause exception either
+ query = NumericRangeQuery.newIntRange(NUMERIC_FIELD_NAME, 2, 6, true, true);
+ searcher = new IndexSearcher(ramDir);
+ hits = searcher.search(query);
+ int maxNumFragmentsRequired = 2;
+
+ QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
+ Highlighter highlighter = new Highlighter(this, scorer);
+
+ for (int i = 0; i < hits.length(); i++) {
+ String text = hits.doc(i).get(NUMERIC_FIELD_NAME);
+ TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
+
+ highlighter.setTextFragmenter(new SimpleFragmenter(40));
+
+ String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
+ "...");
+ //System.out.println("\t" + result);
+ }
+
+
+ }
public void testSimpleQueryScorerPhraseHighlighting2() throws Exception {
doSearching("\"text piece long\"~5");
@@ -594,6 +622,42 @@
numHighlights == 5);
}
+ public void testRangeQuery() throws Exception {
+
+ numHighlights = 0;
+
+ query = new RangeQuery(new Term(FIELD_NAME, "kannedy"), new Term(FIELD_NAME, "kznnedy"), true);
+
+ searcher = new IndexSearcher(ramDir);
+ // can't rewrite ConstantScoreRangeQuery if you want to highlight it -
+ // it rewrites to ConstantScoreQuery which cannot be highlighted
+ // query = unReWrittenQuery.rewrite(reader);
+ System.out.println("Searching for: " + query.toString(FIELD_NAME));
+ hits = searcher.search(query);
+
+ for (int i = 0; i < hits.length(); i++) {
+ String text = hits.doc(i).get(HighlighterTest.FIELD_NAME);
+ int maxNumFragmentsRequired = 2;
+ String fragmentSeparator = "...";
+ QueryScorer scorer = null;
+ TokenStream tokenStream = null;
+
+ tokenStream = analyzer.tokenStream(HighlighterTest.FIELD_NAME, new StringReader(text));
+
+ scorer = new QueryScorer(query, HighlighterTest.FIELD_NAME);
+
+ Highlighter highlighter = new Highlighter(this, scorer);
+
+ highlighter.setTextFragmenter(new SimpleFragmenter(20));
+
+ String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
+ fragmentSeparator);
+ System.out.println("\t" + result);
+ }
+ assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
+ numHighlights == 5);
+ }
+
public void testConstantScoreMultiTermQuery() throws Exception {
numHighlights = 0;
@@ -1606,7 +1670,26 @@
for (int i = 0; i < texts.length; i++) {
addDoc(writer, texts[i]);
}
-
+ Document doc = new Document();
+ NumericField nfield = new NumericField(NUMERIC_FIELD_NAME, Store.YES, true);
+ nfield.setIntValue(1);
+ doc.add(nfield);
+ writer.addDocument(doc, analyzer);
+ nfield = new NumericField(NUMERIC_FIELD_NAME, Store.YES, true);
+ nfield.setIntValue(3);
+ doc = new Document();
+ doc.add(nfield);
+ writer.addDocument(doc, analyzer);
+ nfield = new NumericField(NUMERIC_FIELD_NAME, Store.YES, true);
+ nfield.setIntValue(5);
+ doc = new Document();
+ doc.add(nfield);
+ writer.addDocument(doc, analyzer);
+ nfield = new NumericField(NUMERIC_FIELD_NAME, Store.YES, true);
+ nfield.setIntValue(7);
+ doc = new Document();
+ doc.add(nfield);
+ writer.addDocument(doc, analyzer);
writer.optimize();
writer.close();
reader = IndexReader.open(ramDir);