Author: siren
Date: Mon Feb 6 10:43:53 2006
New Revision: 375329
URL: http://svn.apache.org/viewcvs?rev=375329&view=rev
Log:
fixes for hadoop split
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.java
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.java?rev=375329&r1=375328&r2=375329&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.java
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.java
Mon Feb 6 10:43:53 2006
@@ -4,7 +4,6 @@
import org.apache.nutch.searcher.Query;
import org.apache.nutch.searcher.QueryFilters;
import org.apache.nutch.searcher.Query.Clause;
-import org.apache.nutch.searcher.Query.Clause;
import org.apache.hadoop.conf.Configuration;
import org.apache.lucene.analysis.StopFilter;
import org.apache.nutch.util.NutchConfiguration;
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj?rev=375329&r1=375328&r2=375329&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj Mon
Feb 6 10:43:53 2006
@@ -31,8 +31,8 @@
import org.apache.nutch.searcher.Query;
import org.apache.nutch.searcher.QueryFilters;
import org.apache.nutch.searcher.Query.Clause;
-import org.apache.nutch.searcher.Query.Clause;
-import org.apache.nutch.util.NutchConf;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.nutch.util.NutchConfiguration;
import org.apache.lucene.analysis.StopFilter;
import java.io.*;
@@ -62,12 +62,12 @@
}
/** Construct a query parser for the text in a reader. */
- public static Query parseQuery(String queryString, NutchConf nutchConf)
throws IOException {
+ public static Query parseQuery(String queryString, Configuration conf)
throws IOException {
NutchAnalysis parser =
new NutchAnalysis(new FastCharStream(new StringReader(queryString)));
parser.queryString = queryString;
- parser.queryFilters = new QueryFilters(nutchConf);
- return parser.parse(nutchConf);
+ parser.queryFilters = new QueryFilters(conf);
+ return parser.parse(conf);
}
/** For debugging. */
@@ -76,7 +76,7 @@
while (true) {
System.out.print("Query: ");
String line = in.readLine();
- System.out.println(parseQuery(line, new NutchConf()));
+ System.out.println(parseQuery(line, NutchConfiguration.create()));
}
}
@@ -178,9 +178,9 @@
/** Parse a query. */
-Query parse(NutchConf nutchConf) :
+Query parse(Configuration conf) :
{
- Query query = new Query(nutchConf);
+ Query query = new Query(conf);
ArrayList terms;
Token token;
String field;
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java?rev=375329&r1=375328&r2=375329&view=diff
==============================================================================
---
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java
(original)
+++
lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java
Mon Feb 6 10:43:53 2006
@@ -3,9 +3,9 @@
import org.apache.nutch.searcher.Query;
import org.apache.nutch.searcher.QueryFilters;
import org.apache.nutch.searcher.Query.Clause;
-import org.apache.nutch.searcher.Query.Clause;
import org.apache.hadoop.conf.Configuration;
import org.apache.lucene.analysis.StopFilter;
+import org.apache.nutch.util.NutchConfiguration;
import java.io.*;
import java.util.*;
