svn commit: r1352819 - in /mahout/trunk: core/src/main/java/org/apache/mahout/common/CommandLineUtil.java integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java

[sr...@apache.org]

Author: srowen
Date: Fri Jun 22 09:38:37 2012
New Revision: 1352819

URL: http://svn.apache.org/viewvc?rev=1352819&view=rev
Log:
MAHOUT-1003 fix bad help display due to 100-arg --filter arg

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
    mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java?rev=1352819&r1=1352818&r2=1352819&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java Fri Jun 22 09:38:37 2012
@@ -22,7 +22,6 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 
 import com.google.common.base.Charsets;
-import org.apache.commons.cli.Options;
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.OptionException;
 import org.apache.commons.cli2.util.HelpFormatter;
@@ -47,37 +46,23 @@ public final class CommandLineUtil {
    * @param group job-specific command-line options.
    */
   public static void printHelpWithGenericOptions(Group group) throws IOException {
-    Options ops = new Options();
-    new GenericOptionsParser(new Configuration(), ops, new String[0]);
-    org.apache.commons.cli.HelpFormatter fmt = new org.apache.commons.cli.HelpFormatter();
-    fmt.printHelp("<command> [Generic Options] [Job-Specific Options]", 
-        "Generic Options:", ops, "");
-    
+    new GenericOptionsParser(new Configuration(), new org.apache.commons.cli.Options(), new String[0]);
     PrintWriter pw = new PrintWriter(new OutputStreamWriter(System.out, Charsets.UTF_8), true);
     HelpFormatter formatter = new HelpFormatter();
     formatter.setGroup(group);
     formatter.setPrintWriter(pw);
-    formatter.printHelp();
     formatter.setFooter("Specify HDFS directories while running on hadoop; else specify local file system directories");
-    formatter.printFooter();
-
-    pw.flush();
+    formatter.print();
   }
 
   public static void printHelpWithGenericOptions(Group group, OptionException oe) throws IOException {
-    Options ops = new Options();
-    new GenericOptionsParser(new Configuration(), ops, new String[0]);
-    org.apache.commons.cli.HelpFormatter fmt = new org.apache.commons.cli.HelpFormatter();
-    fmt.printHelp("<command> [Generic Options] [Job-Specific Options]",
-        "Generic Options:", ops, "");
-
+    new GenericOptionsParser(new Configuration(), new org.apache.commons.cli.Options(), new String[0]);
     PrintWriter pw = new PrintWriter(new OutputStreamWriter(System.out, Charsets.UTF_8), true);
     HelpFormatter formatter = new HelpFormatter();
     formatter.setGroup(group);
     formatter.setPrintWriter(pw);
     formatter.setException(oe);
     formatter.print();
-    pw.flush();
   }
 
 }

Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java?rev=1352819&r1=1352818&r2=1352819&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java Fri Jun 22 09:38:37 2012
@@ -86,7 +86,7 @@ public final class VectorDumper extends 
     addOption("vectorSize", "vs", "Truncate vectors to <vs> length when dumping (most useful when in"
             + " conjunction with -sort", false);
     addOption(buildOption("filter", "fi", "Only dump out those vectors whose name matches the filter." 
-            + "  Multiple items may be specified by repeating the argument.", true, 1, 100, false, null));
+            + "  Multiple items may be specified by repeating the argument.", true, 1, Integer.MAX_VALUE, false, null));
 
     if (parseArguments(args, false, true) == null) {
       return -1;