svn commit: r1336204 - in /nutch/branches/nutchgora: CHANGES.txt src/java/org/apache/nutch/crawl/DbUpdaterJob.java src/java/org/apache/nutch/crawl/InjectorJob.java src/java/org/apache/nutch/fetcher/FetcherJob.java

[ferdy]

Author: ferdy
Date: Wed May  9 13:41:20 2012
New Revision: 1336204

URL: http://svn.apache.org/viewvc?rev=1336204&view=rev
Log:
NUTCH-1358 Do not accept bogus arguments

Modified:
    nutch/branches/nutchgora/CHANGES.txt
    nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/DbUpdaterJob.java
    nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/InjectorJob.java
    nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherJob.java

Modified: nutch/branches/nutchgora/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1336204&r1=1336203&r2=1336204&view=diff
==============================================================================
--- nutch/branches/nutchgora/CHANGES.txt (original)
+++ nutch/branches/nutchgora/CHANGES.txt Wed May  9 13:41:20 2012
@@ -1,6 +1,7 @@
 Nutch Change Log
 
 Release nutchgora - Current Development
+* NUTCH-1358 Do not accept bogus arguments (ferdy)
 
 * NUTCH-1349 Make batchId explcit within debug logging and improve CLI 
(lewismc + ferdy)
 

Modified: 
nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/DbUpdaterJob.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/DbUpdaterJob.java?rev=1336204&r1=1336203&r2=1336204&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/DbUpdaterJob.java 
(original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/DbUpdaterJob.java 
Wed May  9 13:41:20 2012
@@ -107,8 +107,12 @@ public class DbUpdaterJob extends NutchT
 
   public int run(String[] args) throws Exception {
     String crawlId = null;
-    if (args.length == 2 && "-crawlId".equals(args[0])) {
+    if (args.length == 0) {
+      //
+    } else if (args.length == 2 && "-crawlId".equals(args[0])) {
       crawlId = args[1];
+    } else {
+      throw new IllegalArgumentException("usage: " + "(-crawlId <id>)");
     }
     return updateTable(crawlId);
   }

Modified: 
nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/InjectorJob.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/InjectorJob.java?rev=1336204&r1=1336203&r2=1336204&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/InjectorJob.java 
(original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/InjectorJob.java 
Wed May  9 13:41:20 2012
@@ -274,8 +274,14 @@ public class InjectorJob extends NutchTo
       System.err.println("Usage: InjectorJob <url_dir> [-crawlId <id>]");
       return -1;
     }
-    if (args.length == 3 && "-crawlId".equals(args[1])) {
-      getConf().set(Nutch.CRAWL_ID_KEY, args[2]);
+    for (int i = 1; i < args.length; i++) {
+      if ("-crawlId".equals(args[i])) {
+        getConf().set(Nutch.CRAWL_ID_KEY, args[i+1]);
+        i++;
+      } else {
+        System.err.println("Unrecognized arg " + args[i]);
+        return -1;
+      }
     }
 
     try {

Modified: 
nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherJob.java
URL: 
http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherJob.java?rev=1336204&r1=1336203&r2=1336204&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherJob.java 
(original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherJob.java 
Wed May  9 13:41:20 2012
@@ -293,6 +293,8 @@ public class FetcherJob extends NutchToo
         numTasks = Integer.parseInt(args[++i]);
       } else if ("-crawlId".equals(args[i])) {
         getConf().set(Nutch.CRAWL_ID_KEY, args[++i]);
+      } else {
+        throw new IllegalArgumentException("arg " +args[i]+ " not recognized");
       }
     }