svn commit: r1693844 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/crawl/Generator.java

[ma...@apache.org]

Author: mattmann
Date: Mon Aug  3 00:01:58 2015
New Revision: 1693844

URL: http://svn.apache.org/r1693844
Log:
Fix for NUTCH-2066: Parameterize Generate REST endpoint contributed by Sujen Shah <su...@gmail.com> this closes #47.

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java

Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1693844&r1=1693843&r2=1693844&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon Aug  3 00:01:58 2015
@@ -2,6 +2,8 @@ Nutch Change Log
   
 Nutch Current Development 1.11-SNAPSHOT
 
+* NUTCH-2066 Parameterize Generate REST endpoint (Sujen Shah via mattmann)
+
 * NUTCH-2072 Deflate encoding support is broken when http.content.limit is set to -1 (Tanguy Moal via mattmann)
 
 * NUTCH-2062 Add Plugin for interacting with Selenium WebDriver (Michael Joyce, mattmann)

Modified: nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java
URL: http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java?rev=1693844&r1=1693843&r2=1693844&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java Mon Aug  3 00:01:58 2015
@@ -757,9 +757,9 @@ public class Generator extends NutchTool
 
     Map<String, Object> results = new HashMap<String, Object>();
     String RESULT = "result";
-    String crawldb = crawlId+"/crawldb";
+    String crawldb = (args.containsKey("crawldb")) ? args.get("crawldb") : crawlId+"/crawldb";
     Path dbDir = new Path(crawldb);
-    String segments_dir = crawlId+"/segments";
+    String segments_dir = (args.containsKey("segment_dir")) ? args.get("segments_dir") : crawlId+"/segments";
     Path segmentsDir = new Path(segments_dir);
     long curTime = System.currentTimeMillis();
     long topN = Long.MAX_VALUE;