updated errorchecking so it checks if the parameter is valid for the command.

[mothur.git] / validcommands.cpp

diff --git a/validcommands.cpp b/validcommands.cpp
index 70a6502424a5524bbd517d53aa791c6924f552a5..b2e07acae111e10f0324b95b18ca74034249315b 100644 (file)
--- a/validcommands.cpp
+++ b/validcommands.cpp
@@ -15,18 +15,26 @@ ValidCommands::ValidCommands() {
        try {
        
                commands["read.dist"]                   = "read.dist"; 
-               commands["read.otu"]                    = "read.otu"; 
-               commands["read.list"]                   = "read.list"; 
+               commands["read.otu"]                    = "read.otu";
+               commands["read.tree"]                   = "read.tree"; 
                commands["cluster"]                             = "cluster"; 
                commands["deconvolute"]                 = "deconvolute"; 
-               commands["help"]                                = "help"; 
-               commands["quit"]                                = "quit"; 
                commands["collect.single"]              = "collect.single"; 
                commands["collect.shared"]              = "collect.shared"; 
                commands["rarefaction.single"]  = "rarefaction.single"; 
                commands["rarefaction.shared"]  = "rarefaction.shared"; 
                commands["summary.single"]              = "summary.single"; 
                commands["summary.shared"]              = "summary.shared"; 
+               commands["parsimony"]                   = "parsimony";
+               commands["unifrac.weighted"]    = "unifrac.weighted"; 
+               commands["unifrac.unweighted"]  = "unifrac.unweighted"; 
+               commands["libshuff"]                    = "libshuff";
+               commands["get.group"]           = "get.group";
+               commands["get.label"]           = "get.label";
+               commands["get.line"]            = "get.line";
+               commands["help"]                                = "help"; 
+               commands["quit"]                                = "quit"; 
+
                                
        }
        catch(exception& e) {
@@ -51,7 +59,11 @@ bool ValidCommands::isValidCommand(string command) {
                if ((commands.find(command)) != (commands.end())) {
                        return true;
                }else{
-                       cout << command << " is not a valid command in Mothur.  Valid commands are read.dist(), read.list(), cluster(), collect.single(), collect.shared(), rarefaction.single(), rarefaction.shared(), summary.single(), summary.shared(), quit(), help()." << endl;
+                       cout << command << " is not a valid command in Mothur.  Valid commands are ";
+                       for (it = commands.begin(); it != commands.end(); it++) {
+                               cout << it->first << ", ";
+                       }
+                       cout << endl;
                        return false;
                }
                
@@ -66,4 +78,25 @@ bool ValidCommands::isValidCommand(string command) {
        }
 }
 
-/***********************************************************************/
\ No newline at end of file
+/***********************************************************************/
+void ValidCommands::printCommands(ostream& out) {
+       try {   
+               out << "Valid commands are ";
+               for (it = commands.begin(); it != commands.end(); it++) {
+                       out << it->first << ", ";
+               }
+               out << endl;
+       }
+       catch(exception& e) {
+               cout << "Standard Error: " << e.what() << " has occurred in the ValidCommands class Function printCommands. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               exit(1);
+       }
+       catch(...) {
+               cout << "An unknown error has occurred in the ValidCommands class function printCommands. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               exit(1);
+       }
+}
+
+
+
+