fixes while testing 1.33.0

[mothur.git] / quitcommand.cpp

diff --git a/quitcommand.cpp b/quitcommand.cpp
index 462fe8fbf43e7f47a93ddefeb1058095cf636f86..2c302e9e6b4f195c7d4acb1df97fd6110ea02ad5 100644 (file)
--- a/quitcommand.cpp
+++ b/quitcommand.cpp
@@ -10,69 +10,19 @@
 #include "quitcommand.h"
 
 //**********************************************************************************************************************
-vector<string> QuitCommand::getValidParameters(){      
-       try {
-               vector<string> myArray; 
-               return myArray;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "QuitCommand", "getValidParameters");
-               exit(1);
-       }
-}
-//**********************************************************************************************************************
-vector<string> QuitCommand::getRequiredParameters(){   
-       try {
-               vector<string> myArray;
-               return myArray;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "QuitCommand", "getRequiredParameters");
-               exit(1);
-       }
-}
-//**********************************************************************************************************************
-vector<string> QuitCommand::getRequiredFiles(){        
-       try {
-               vector<string> myArray;
-               return myArray;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "QuitCommand", "getRequiredFiles");
-               exit(1);
-       }
-}
-//**********************************************************************************************************************
-
 QuitCommand::QuitCommand(string option) {
                abort = false; calledHelp = false;   
                
                //allow user to run help
                if(option == "help") { help(); abort = true; calledHelp = true; }
+               else if(option == "citation") { citation(); abort = true; calledHelp = true;}
 
 }
 //**********************************************************************************************************************
-
-void QuitCommand::help(){
-       try {
-                m->mothurOut("The quit command will terminate mothur and should be in the following format: \n"); 
-                m->mothurOut("quit() or quit\n\n");
-       }
-       catch(exception& e) {
-               m->errorOut(e, "QuitCommand", "help");
-               exit(1);
-       }
-}
-
-//**********************************************************************************************************************
-
 QuitCommand::~QuitCommand(){}
-
 //**********************************************************************************************************************
-
 int QuitCommand::execute(){
        if (abort == true) { return 0; }
        return 1;
 }
-
 //**********************************************************************************************************************