svn commit: r449287 - in /lucene/nutch/trunk/src/java/org/apache/nutch: crawl/Crawl.java fetcher/Fetcher.java

[ab]

Author: ab
Date: Sat Sep 23 11:50:56 2006
New Revision: 449287

URL: http://svn.apache.org/viewvc?view=rev&rev=449287
Log:
NUTCH-337: obey "fetcher.parse" property if -noParsing is not specified.

Modified:
    lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java
    lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java

Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java?view=diff&rev=449287&r1=449286&r2=449287
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java Sat Sep 23 
11:50:56 2006
@@ -117,7 +117,7 @@
       Path segment =
         generator.generate(crawlDb, segments, -1,
                                      topN, System.currentTimeMillis());
-      fetcher.fetch(segment, threads, Fetcher.isParsing(job));  // fetch it
+      fetcher.fetch(segment, threads);  // fetch it
       if (!Fetcher.isParsing(job)) {
         parseSegment.parse(segment);    // parse it, if needed
       }

Modified: lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java?view=diff&rev=449287&r1=449286&r2=449287
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java Sat Sep 
23 11:50:56 2006
@@ -410,7 +410,7 @@
     
   }
 
-  public void fetch(Path segment, int threads, boolean parsing)
+  public void fetch(Path segment, int threads)
     throws IOException {
 
     if (LOG.isInfoEnabled()) {
@@ -423,7 +423,6 @@
 
     job.setInt("fetcher.threads.fetch", threads);
     job.set(SEGMENT_NAME_KEY, segment.getName());
-    job.setBoolean("fetcher.parse", parsing);
 
     // for politeness, don't permit parallel execution of a single task
     job.setSpeculativeExecution(false);
@@ -475,7 +474,7 @@
       getConf().setBoolean("fetcher.parse", parsing);
     }
     try {
-      fetch(segment, threads, parsing);              // run the Fetcher
+      fetch(segment, threads);              // run the Fetcher
       return 0;
     } catch (Exception e) {
       LOG.fatal("Fetcher: " + StringUtils.stringifyException(e));