You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by si...@apache.org on 2006/03/05 11:55:19 UTC
svn commit: r383304 - in /lucene/nutch/trunk/src:
java/org/apache/nutch/indexer/ java/org/apache/nutch/searcher/
java/org/apache/nutch/tools/
plugin/creativecommons/src/java/org/creativecommons/nutch/
plugin/index-basic/src/java/org/apache/nutch/indexe...
Author: siren
Date: Sun Mar 5 02:55:17 2006
New Revision: 383304
URL: http://svn.apache.org/viewcvs?rev=383304&view=rev
Log:
NUTCH-221, removed deprecated Lucene API usage
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/indexer/DeleteDuplicates.java
lucene/nutch/trunk/src/java/org/apache/nutch/indexer/IndexMerger.java
lucene/nutch/trunk/src/java/org/apache/nutch/indexer/Indexer.java
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/FieldQueryFilter.java
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneQueryOptimizer.java
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/RawFieldQueryFilter.java
lucene/nutch/trunk/src/java/org/apache/nutch/tools/PruneIndexTool.java
lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCDeleteUnlicensedTool.java
lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
lucene/nutch/trunk/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
lucene/nutch/trunk/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
lucene/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/LanguageIndexingFilter.java
lucene/nutch/trunk/src/plugin/query-basic/src/java/org/apache/nutch/searcher/basic/BasicQueryFilter.java
lucene/nutch/trunk/src/plugin/query-more/src/java/org/apache/nutch/searcher/more/DateQueryFilter.java
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/indexer/DeleteDuplicates.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/indexer/DeleteDuplicates.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/indexer/DeleteDuplicates.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/indexer/DeleteDuplicates.java Sun Mar 5 02:55:17 2006
@@ -268,7 +268,7 @@
IndexReader reader = IndexReader.open(new FsDirectory(fs, index, false, getConf()));
try {
while (values.hasNext()) {
- reader.delete(((IntWritable)values.next()).get());
+ reader.deleteDocument(((IntWritable)values.next()).get());
}
} finally {
reader.close();
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/indexer/IndexMerger.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/indexer/IndexMerger.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/indexer/IndexMerger.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/indexer/IndexMerger.java Sun Mar 5 02:55:17 2006
@@ -84,11 +84,11 @@
// Merge indices
//
IndexWriter writer = new IndexWriter(localOutput, null, true);
- writer.mergeFactor = conf.getInt("indexer.mergeFactor", IndexWriter.DEFAULT_MERGE_FACTOR);
- writer.minMergeDocs = conf.getInt("indexer.minMergeDocs", IndexWriter.DEFAULT_MIN_MERGE_DOCS);
- writer.maxMergeDocs = conf.getInt("indexer.maxMergeDocs", IndexWriter.DEFAULT_MAX_MERGE_DOCS);
+ writer.setMergeFactor(conf.getInt("indexer.mergeFactor", IndexWriter.DEFAULT_MERGE_FACTOR));
+ writer.setMaxBufferedDocs(conf.getInt("indexer.minMergeDocs", IndexWriter.DEFAULT_MAX_BUFFERED_DOCS));
+ writer.setMaxMergeDocs(conf.getInt("indexer.maxMergeDocs", IndexWriter.DEFAULT_MAX_MERGE_DOCS));
writer.setTermIndexInterval(conf.getInt("indexer.termIndexInterval", IndexWriter.DEFAULT_TERM_INDEX_INTERVAL));
- writer.infoStream = LogFormatter.getLogStream(LOG, Level.FINE);
+ writer.setInfoStream(LogFormatter.getLogStream(LOG, Level.FINE));
writer.setUseCompoundFile(false);
writer.setSimilarity(new NutchSimilarity());
writer.addIndexes(dirs);
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/indexer/Indexer.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/indexer/Indexer.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/indexer/Indexer.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/indexer/Indexer.java Sun Mar 5 02:55:17 2006
@@ -88,14 +88,13 @@
new IndexWriter(fs.startLocalOutput(perm, temp),
new NutchDocumentAnalyzer(job), true);
- writer.mergeFactor = job.getInt("indexer.mergeFactor", 10);
- writer.minMergeDocs = job.getInt("indexer.minMergeDocs", 100);
- writer.maxMergeDocs =
- job.getInt("indexer.maxMergeDocs", Integer.MAX_VALUE);
+ writer.setMergeFactor(job.getInt("indexer.mergeFactor", 10));
+ writer.setMaxBufferedDocs(job.getInt("indexer.minMergeDocs", 100));
+ writer.setMaxMergeDocs(job.getInt("indexer.maxMergeDocs", Integer.MAX_VALUE));
writer.setTermIndexInterval
(job.getInt("indexer.termIndexInterval", 128));
- writer.maxFieldLength = job.getInt("indexer.max.tokens", 10000);
- writer.infoStream = LogFormatter.getLogStream(LOG, Level.INFO);
+ writer.setMaxFieldLength(job.getInt("indexer.max.tokens", 10000));
+ writer.setInfoStream(LogFormatter.getLogStream(LOG, Level.INFO));
writer.setUseCompoundFile(false);
writer.setSimilarity(new NutchSimilarity());
@@ -204,18 +203,20 @@
String[] anchors = inlinks!=null ? inlinks.getAnchors() : new String[0];
// add segment, used to map from merged index back to segment files
- doc.add(Field.UnIndexed("segment",
- metadata.get(Fetcher.SEGMENT_NAME_KEY)));
+ doc.add(new Field("segment", metadata.get(Fetcher.SEGMENT_NAME_KEY),
+ Field.Store.YES, Field.Index.NO));
// add digest, used by dedup
- doc.add(Field.UnIndexed("digest", metadata.get(Fetcher.SIGNATURE_KEY)));
+ doc.add(new Field("digest", metadata.get(Fetcher.SIGNATURE_KEY),
+ Field.Store.YES, Field.Index.NO));
// boost is opic
float boost = (float)Math.pow(dbDatum.getScore(), scorePower);
// apply boost to all indexed fields.
doc.setBoost(boost);
// store boost for use by explain and dedup
- doc.add(Field.UnIndexed("boost", Float.toString(boost)));
+ doc.add(new Field("boost", Float.toString(boost),
+ Field.Store.YES, Field.Index.NO));
// LOG.info("Url: "+key.toString());
// LOG.info("Title: "+parseData.getTitle());
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/FieldQueryFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/FieldQueryFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/FieldQueryFilter.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/FieldQueryFilter.java Sun Mar 5 02:55:17 2006
@@ -16,6 +16,7 @@
package org.apache.nutch.searcher;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.TermQuery;
@@ -86,7 +87,15 @@
// set boost
luceneClause.setBoost(boost);
// add it as specified in query
- output.add(luceneClause, c.isRequired(), c.isProhibited());
+
+ output.add(luceneClause,
+ (c.isProhibited()
+ ? BooleanClause.Occur.MUST_NOT
+ : (c.isRequired()
+ ? BooleanClause.Occur.MUST
+ : BooleanClause.Occur.SHOULD
+ )
+ ));
}
// return the modified Lucene query
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneQueryOptimizer.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneQueryOptimizer.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneQueryOptimizer.java Sun Mar 5 02:55:17 2006
@@ -98,18 +98,18 @@
BooleanClause[] clauses = original.getClauses();
for (int i = 0; i < clauses.length; i++) {
BooleanClause c = clauses[i];
- if (c.required // required
- && c.query.getBoost() == 0.0f) { // boost is zero
+ if (c.isRequired() // required
+ && c.getQuery().getBoost() == 0.0f) { // boost is zero
- if (c.query instanceof TermQuery // TermQuery
- && (searcher.docFreq(((TermQuery)c.query).getTerm())
+ if (c.getQuery() instanceof TermQuery // TermQuery
+ && (searcher.docFreq(((TermQuery)c.getQuery()).getTerm())
/ (float)searcher.maxDoc()) < threshold) { // beneath threshold
query.add(c); // don't filterize
continue;
}
- if (c.query instanceof RangeQuery) { // RangeQuery
- RangeQuery range = (RangeQuery)c.query;
+ if (c.getQuery() instanceof RangeQuery) { // RangeQuery
+ RangeQuery range = (RangeQuery)c.getQuery();
boolean inclusive = range.isInclusive();// convert to RangeFilter
Term lower = range.getLowerTerm();
Term upper = range.getUpperTerm();
@@ -117,13 +117,13 @@
lower != null ? lower.text() : null,
upper != null ? upper.text() : null,
inclusive, inclusive));
- cacheQuery.add(c.query, true, false); // cache it
+ cacheQuery.add(c.getQuery(), BooleanClause.Occur.MUST); // cache it
continue;
}
// all other query types
- filterQuery.add(c.query, true, false); // filter it
- cacheQuery.add(c.query, true, false); // cache it
+ filterQuery.add(c.getQuery(), BooleanClause.Occur.MUST); // filter it
+ cacheQuery.add(c.getQuery(), BooleanClause.Occur.MUST); // cache it
continue;
}
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/RawFieldQueryFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/RawFieldQueryFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/RawFieldQueryFilter.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/RawFieldQueryFilter.java Sun Mar 5 02:55:17 2006
@@ -16,6 +16,7 @@
package org.apache.nutch.searcher;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.index.Term;
@@ -74,7 +75,15 @@
// set boost
clause.setBoost(boost);
// add it as specified in query
- output.add(clause, c.isRequired(), c.isProhibited());
+
+ output.add(clause,
+ (c.isProhibited()
+ ? BooleanClause.Occur.MUST_NOT
+ : (c.isRequired()
+ ? BooleanClause.Occur.MUST
+ : BooleanClause.Occur.SHOULD
+ )
+ ));
}
// return the modified Lucene query
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/tools/PruneIndexTool.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/tools/PruneIndexTool.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/tools/PruneIndexTool.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/tools/PruneIndexTool.java Sun Mar 5 02:55:17 2006
@@ -351,7 +351,7 @@
doDelete = check;
} else doDelete = true;
if (doDelete) {
- if (!dryrun) reader.delete(docNum);
+ if (!dryrun) reader.deleteDocument(docNum);
cnt++;
}
} catch (Exception e) {
Modified: lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCDeleteUnlicensedTool.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCDeleteUnlicensedTool.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCDeleteUnlicensedTool.java (original)
+++ lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCDeleteUnlicensedTool.java Sun Mar 5 02:55:17 2006
@@ -55,7 +55,7 @@
if (!reader.isDeleted(doc)) {
Document document = reader.document(doc);
if (document.get(CCIndexingFilter.FIELD)==null){ // no CC fields
- reader.delete(doc); // delete it
+ reader.deleteDocument(doc); // delete it
deleteCount++;
}
}
Modified: lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java Sun Mar 5 02:55:17 2006
@@ -104,7 +104,7 @@
}
private void addFeature(Document doc, String feature) {
- doc.add(Field.Keyword(FIELD, feature));
+ doc.add(new Field(FIELD, feature, Field.Store.YES, Field.Index.UN_TOKENIZED));
}
public void setConf(Configuration conf) {
Modified: lucene/nutch/trunk/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java Sun Mar 5 02:55:17 2006
@@ -56,23 +56,23 @@
if (host != null) {
// add host as un-stored, indexed and tokenized
- doc.add(Field.UnStored("host", host));
+ doc.add(new Field("host", host, Field.Store.NO, Field.Index.TOKENIZED));
// add site as un-stored, indexed and un-tokenized
- doc.add(new Field("site", host, false, true, false));
+ doc.add(new Field("site", host, Field.Store.NO, Field.Index.UN_TOKENIZED));
}
// url is both stored and indexed, so it's both searchable and returned
- doc.add(Field.Text("url", url.toString()));
+ doc.add(new Field("url", url.toString(), Field.Store.YES, Field.Index.TOKENIZED));
// content is indexed, so that it's searchable, but not stored in index
- doc.add(Field.UnStored("content", parse.getText()));
+ doc.add(new Field("content", parse.getText(), Field.Store.NO, Field.Index.TOKENIZED));
// anchors are indexed, so they're searchable, but not stored in index
try {
String[] anchors = (inlinks != null ? inlinks.getAnchors() : new String[0]);
for (int i = 0; i < anchors.length; i++) {
- doc.add(Field.UnStored("anchor", anchors[i]));
+ doc.add(new Field("anchor", anchors[i], Field.Store.NO, Field.Index.TOKENIZED));
}
} catch (IOException ioe) {
LOG.warning("BasicIndexingFilter: can't get anchors for " + url.toString());
@@ -84,7 +84,7 @@
title = title.substring(0, MAX_TITLE_LENGTH);
}
// add title indexed and stored so that it can be displayed
- doc.add(Field.Text("title", title));
+ doc.add(new Field("title", title, Field.Store.YES, Field.Index.TOKENIZED));
return doc;
}
Modified: lucene/nutch/trunk/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java Sun Mar 5 02:55:17 2006
@@ -105,7 +105,7 @@
if (lastModified != null) { // try parse last-modified
time = getTime(lastModified,url); // use as time
// store as string
- doc.add(Field.UnIndexed("lastModified", new Long(time).toString()));
+ doc.add(new Field("lastModified", new Long(time).toString(), Field.Store.YES, Field.Index.NO));
}
if (time == -1) { // if no last-modified
@@ -119,7 +119,7 @@
String dateString = sdf.format(new Date(time));
// un-stored, indexed and un-tokenized
- doc.add(new Field("date", dateString, false, true, false));
+ doc.add(new Field("date", dateString, Field.Store.NO, Field.Index.UN_TOKENIZED));
return doc;
}
@@ -169,7 +169,7 @@
String contentLength = data.getMeta(Response.CONTENT_LENGTH);
if (contentLength != null)
- doc.add(Field.UnIndexed("contentLength", contentLength));
+ doc.add(new Field("contentLength", contentLength, Field.Store.YES, Field.Index.NO));
return doc;
}
@@ -221,14 +221,14 @@
// type:vnd.ms-powerpoint
// all case insensitive.
// The query filter is implemented in TypeQueryFilter.java
- doc.add(new Field("type", contentType, false, true, false));
- doc.add(new Field("type", primaryType, false, true, false));
- doc.add(new Field("type", subType, false, true, false));
+ doc.add(new Field("type", contentType, Field.Store.NO, Field.Index.UN_TOKENIZED));
+ doc.add(new Field("type", primaryType, Field.Store.NO, Field.Index.UN_TOKENIZED));
+ doc.add(new Field("type", subType, Field.Store.NO, Field.Index.UN_TOKENIZED));
// add its primaryType and subType to respective fields
// as stored, indexed and un-tokenized
- doc.add(new Field("primaryType", primaryType, true, true, false));
- doc.add(new Field("subType", subType, true, true, false));
+ doc.add(new Field("primaryType", primaryType, Field.Store.YES, Field.Index.UN_TOKENIZED));
+ doc.add(new Field("subType", subType, Field.Store.YES, Field.Index.UN_TOKENIZED));
return doc;
}
@@ -266,7 +266,7 @@
for (int i=0; i<patterns.length; i++) {
if (matcher.contains(contentDisposition,patterns[i])) {
result = matcher.getMatch();
- doc.add(Field.UnIndexed("title", result.group(1)));
+ doc.add(new Field("title", result.group(1), Field.Store.YES, Field.Index.NO));
break;
}
}
Modified: lucene/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/LanguageIndexingFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/LanguageIndexingFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/LanguageIndexingFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/LanguageIndexingFilter.java Sun Mar 5 02:55:17 2006
@@ -91,7 +91,7 @@
lang = "unknown";
}
- doc.add(Field.Keyword("lang", lang));
+ doc.add(new Field("lang", lang, Field.Store.YES, Field.Index.UN_TOKENIZED));
return doc;
}
Modified: lucene/nutch/trunk/src/plugin/query-basic/src/java/org/apache/nutch/searcher/basic/BasicQueryFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-basic/src/java/org/apache/nutch/searcher/basic/BasicQueryFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/query-basic/src/java/org/apache/nutch/searcher/basic/BasicQueryFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/query-basic/src/java/org/apache/nutch/searcher/basic/BasicQueryFilter.java Sun Mar 5 02:55:17 2006
@@ -16,6 +16,7 @@
package org.apache.nutch.searcher.basic;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.TermQuery;
@@ -100,9 +101,14 @@
out.add(o.isPhrase()
? exactPhrase(o.getPhrase(), FIELDS[f], FIELD_BOOSTS[f])
: termQuery(FIELDS[f], o.getTerm(), FIELD_BOOSTS[f]),
- false, false);
+ BooleanClause.Occur.SHOULD);
}
- output.add(out, c.isRequired(), c.isProhibited());
+ output.add(out, (c.isProhibited()
+ ? BooleanClause.Occur.MUST_NOT
+ : (c.isRequired()
+ ? BooleanClause.Occur.MUST
+ : BooleanClause.Occur.SHOULD
+ )));
}
}
@@ -134,7 +140,7 @@
}
if (sloppyTerms > 1)
- output.add(sloppyPhrase, false, false);
+ output.add(sloppyPhrase, BooleanClause.Occur.SHOULD);
}
}
Modified: lucene/nutch/trunk/src/plugin/query-more/src/java/org/apache/nutch/searcher/more/DateQueryFilter.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-more/src/java/org/apache/nutch/searcher/more/DateQueryFilter.java?rev=383304&r1=383303&r2=383304&view=diff
==============================================================================
--- lucene/nutch/trunk/src/plugin/query-more/src/java/org/apache/nutch/searcher/more/DateQueryFilter.java (original)
+++ lucene/nutch/trunk/src/plugin/query-more/src/java/org/apache/nutch/searcher/more/DateQueryFilter.java Sun Mar 5 02:55:17 2006
@@ -24,6 +24,7 @@
import org.apache.hadoop.util.LogFormatter;
import org.apache.hadoop.conf.Configuration;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.RangeQuery;
import org.apache.lucene.index.Term;
@@ -80,7 +81,14 @@
rangeQuery.setBoost(0.0f); // trigger filterization
- output.add(rangeQuery, c.isRequired(), c.isProhibited());
+ output.add(rangeQuery,
+ (c.isProhibited()
+ ? BooleanClause.Occur.MUST_NOT
+ : (c.isRequired()
+ ? BooleanClause.Occur.MUST
+ : BooleanClause.Occur.SHOULD
+ )
+ ));
}