allow user to input quit instead of quit()

[mothur.git] / engine.cpp

diff --git a/engine.cpp b/engine.cpp
index ac49206040520592a212b68594305cf464494155..add84b9e944ceeaaee5cd4313836bca2a751315d 100644 (file)
--- a/engine.cpp
+++ b/engine.cpp
@@ -64,6 +64,9 @@ bool InteractEngine::getInput(){
                        getline(cin, input);
                        if (cin.eof()) { input = "quit()"; }
                        
+                       //allow user to omit the () on the quit command
+                       if (input == "quit") { input = "quit()"; }
+                       
                        errorFree = errorCheckor->checkInput(input);
                        if (errorFree == true) {
                                CommandOptionParser parser(input);
@@ -127,6 +130,9 @@ BatchEngine::~BatchEngine(){
 //This Function allows the user to run a batchfile containing several commands on Dotur
 bool BatchEngine::getInput(){
        try {
+               //check if this is a valid batchfile
+               if (openedBatch == 1) {  cout << "unable to open batchfile" << endl;  return 1; }
+       
                string input = "";
                string commandName = "";
                bool errorFree;
@@ -142,6 +148,10 @@ bool BatchEngine::getInput(){
                                if (inputBatchFile.eof()) { input = "quit()"; }
                        
                                cout << endl << "mothur > " << input << endl;
+                               
+                               //allow user to omit the () on the quit command
+                               if (input == "quit") { input = "quit()"; }
+
                                errorFree = errorCheckor->checkInput(input);
                                if (errorFree == true) {
                                        CommandOptionParser parser(input);