fixes while testing 1.33.0

[mothur.git] / helpcommand.cpp

diff --git a/helpcommand.cpp b/helpcommand.cpp
index 4a97342c27f801ea7bb959f0c411ace6f33393dc..ef54dae941edcf3d8f2720e931d8a9a293574ee3 100644 (file)
--- a/helpcommand.cpp
+++ b/helpcommand.cpp
@@ -11,27 +11,22 @@
 
 //**********************************************************************************************************************
 
-HelpCommand::HelpCommand(string option){
-       
-       if (option != "") { cout << "There are no valid parameters for the help() command." << endl;  } 
-       validCommands = new ValidCommands();
+HelpCommand::HelpCommand(string option)  {     
+       validCommands = CommandFactory::getInstance();  
 }
-
-//**********************************************************************************************************************
-
-HelpCommand::~HelpCommand(){}
-
 //**********************************************************************************************************************
-
 int HelpCommand::execute(){
-
-       validCommands->printCommands(cout);
-       cout << "For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'" << endl;
+       try {
+        validCommands->printCommands(cout);
+               m->mothurOut("For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'"); m->mothurOutEndLine();
        
-       delete validCommands;
+               m->mothurOutEndLine(); m->mothurOut("For further assistance please refer to the Mothur manual on our wiki at http://www.mothur.org/wiki, or contact Pat Schloss at mothur.bugs@gmail.com.\n");
        
-       cout << endl << "For further assistance please refer to the Mothur manual on our wiki at http://schloss.micro.umass.edu/mothur/, or contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-       return 0;
+               return 0;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "HelpCommand", "execute");
+               exit(1);
+       }
 }
-
 //**********************************************************************************************************************/