fixed catchall "clunky" names

[mothur.git] / getlistcountcommand.cpp

diff --git a/getlistcountcommand.cpp b/getlistcountcommand.cpp
index 31b174861c4c577659e478defcb7d0fa1d5e6c7a..78f26047e0debdf3e620b2e0179bfab12fe93354 100644 (file)
--- a/getlistcountcommand.cpp
+++ b/getlistcountcommand.cpp
@@ -24,7 +24,7 @@ vector<string> GetListCountCommand::getValidParameters(){
 //**********************************************************************************************************************
 GetListCountCommand::GetListCountCommand(){    
        try {
-               //initialize outputTypes
+               abort = true; calledHelp = true; 
                vector<string> tempOutNames;
                outputTypes["otu"] = tempOutNames;
        }
@@ -60,12 +60,12 @@ vector<string> GetListCountCommand::getRequiredFiles(){
 GetListCountCommand::GetListCountCommand(string option)  {
        try {
                globaldata = GlobalData::getInstance();
-               abort = false;
+               abort = false; calledHelp = false;   
                allLines = 1;
                labels.clear();
                                
                //allow user to run help
-               if(option == "help") { help(); abort = true; }
+               if(option == "help") { help(); abort = true; calledHelp = true; }
                
                else {
                        //valid paramters for this command
@@ -167,7 +167,7 @@ GetListCountCommand::~GetListCountCommand(){}
 
 int GetListCountCommand::execute(){
        try {
-               if (abort == true) {    return 0;       }
+               if (abort == true) { if (calledHelp) { return 0; }  return 2;   }
 
                globaldata->setFormat("list");