]> git.donarmstrong.com Git - mothur.git/blobdiff - engine.cpp
removed line option
[mothur.git] / engine.cpp
index b0371378c29d72a7b37717e5c5d43cbc8f6ef23c..0a0f5a0ce7f0f4f0a120509e2c3d5c0e51471ecb 100644 (file)
@@ -21,13 +21,7 @@ InteractEngine::InteractEngine(string path){
        globaldata = GlobalData::getInstance();
        globaldata->argv = path;
        
-       system("clear");
-//     char buffer = ' ';
-//     ifstream header("introtext.txt");
-//     while(!header.eof()){
-//             cout << buffer;
-//             buffer = header.get();
-//     }
+       
 }
 
 /***********************************************************************/
@@ -44,32 +38,21 @@ bool InteractEngine::getInput(){
                string commandName = "";
                string options = "";
                int quitCommandCalled = 0;
-               //bool errorFree;
-               //ErrorCheck* errorCheckor = new ErrorCheck();
                
-               cout << "mothur v.1.3.0" << endl;
-               cout << "Last updated: 5/29/2009" << endl << endl;
-               cout << "by" << endl;
-               cout << "Patrick D. Schloss" << endl << endl;
-               cout << "Department of Microbiology" << endl;
-               cout << "The University of Massachusetts" << endl;
-               cout << "pschloss@micro.umass.edu" << endl;
-               cout << "http://schloss.micro.umass.edu/mothur" << endl << endl << endl;
-               cout << "Distributed under the GNU General Public License" << endl << endl;
-               cout << "Type 'help()' for information on the commands that are available" << endl << endl;
-               cout << "Type 'quit()' to exit program" << endl;
-
+                               
                while(quitCommandCalled != 1){
-
-                       cout << endl << "mothur > ";
+                       
+                       mothurOutEndLine();
+                       mothurOut("mothur > ");
                        getline(cin, input);
                        if (cin.eof()) { input = "quit()"; }
                        
+                       mothurOutJustToLog(input);
+                       mothurOutEndLine();
+                       
                        //allow user to omit the () on the quit command
                        if (input == "quit") { input = "quit()"; }
                        
-                       //errorFree = errorCheckor->checkInput(input);
-                       //if (errorFree == true) {
                        CommandOptionParser parser(input);
                        commandName = parser.getCommandString();
                        options = parser.getOptionString();
@@ -82,20 +65,16 @@ bool InteractEngine::getInput(){
                                quitCommandCalled = command->execute();
                                
                        }else {
-                               cout << "Your input contains errors. Please try again." << endl;
+                               mothurOut("Your input contains errors. Please try again."); 
+                               mothurOutEndLine();
                        }
                }       
                return 1;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the InteractEngine class Function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "InteractEngine", "getInput");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the InteractEngine class function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-
 }
 
 /***********************************************************************/
@@ -103,24 +82,13 @@ bool InteractEngine::getInput(){
 BatchEngine::BatchEngine(string path, string batchFileName){
        try {
                globaldata = GlobalData::getInstance();
+       
                openedBatch = openInputFile(batchFileName, inputBatchFile);
                globaldata->argv = path;
-
-               system("clear");
-       
-       //      char buffer = ' ';
-       //      ifstream header("introtext.txt");
-       //      while(!header.eof()){
-       //              cout << buffer;
-       //              buffer = header.get();
-       //      }
+                               
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the BatchEngine class Function BatchEngine. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the BatchEngine class function BatchEngine. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "BatchEngine", "BatchEngine");
                exit(1);
        }
 }
@@ -135,7 +103,11 @@ BatchEngine::~BatchEngine(){
 bool BatchEngine::getInput(){
        try {
                //check if this is a valid batchfile
-               if (openedBatch == 1) {  cout << "unable to open batchfile" << endl;  return 1; }
+               if (openedBatch == 1) {  
+                       mothurOut("unable to open batchfile");  
+                       mothurOutEndLine();
+                       return 1; 
+               }
        
                string input = "";
                string commandName = "";
@@ -145,13 +117,16 @@ bool BatchEngine::getInput(){
                int quitCommandCalled = 0;
        
                while(quitCommandCalled == 0){
-               
+       
                        if (inputBatchFile.eof()) { input = "quit()"; }
-                       else { getline(inputBatchFile, input); }
+                       else { input = getline(inputBatchFile); }
                        
                        if (input[0] != '#') {
-                       
-                               cout << endl << "mothur > " << input << endl;
+                               
+                               mothurOutEndLine();
+                               mothurOut("mothur > " + input);
+                               mothurOutEndLine();
+                               
                                
                                //allow user to omit the () on the quit command
                                if (input == "quit") { input = "quit()"; }
@@ -166,22 +141,136 @@ bool BatchEngine::getInput(){
                                        CommandFactory cFactory;
                                        Command* command = cFactory.getCommand(commandName, options);
                                        quitCommandCalled = command->execute();
-                               }else {         cout << "Invalid." << endl;             }
+                               }else {         
+                                       mothurOut("Invalid."); 
+                                       mothurOutEndLine();
+                               }
                                
                        }
+                       gobble(inputBatchFile);
                }
+               
+               inputBatchFile.close();
                return 1;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the BatchEngine class Function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "BatchEngine", "getInput");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the BatchEngine class function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+}
+
+
+/***********************************************************************/
+/***********************************************************************/
+//This function opens the batchfile to be used by BatchEngine::getInput.
+ScriptEngine::ScriptEngine(string path, string commandString){
+       try {
+               globaldata = GlobalData::getInstance();
+               
+               //remove quotes
+               listOfCommands = commandString.substr(1, (commandString.length()-1));
+
+               globaldata->argv = path;
+               
+               
+       
+       }
+       catch(exception& e) {
+               errorOut(e, "ScriptEngine", "ScriptEngine");
                exit(1);
        }
 }
 
+/***********************************************************************/
+
+ScriptEngine::~ScriptEngine(){
+       }
 
 /***********************************************************************/
+//This Function allows the user to run a batchfile containing several commands on mothur
+bool ScriptEngine::getInput(){
+       try {
+                       
+               string input = "";
+               string commandName = "";
+               string options = "";
+               
+               
+               //CommandFactory cFactory;
+               int quitCommandCalled = 0;
+       
+               while(quitCommandCalled == 0){
+               
+                       input = getNextCommand(listOfCommands); 
+                       
+                       if (input == "") { input = "quit()"; }
+                       
+                       
+                       mothurOutEndLine();
+                       mothurOut("mothur > " + input);
+                       mothurOutEndLine();
+
+                               
+                       //allow user to omit the () on the quit command
+                       if (input == "quit") { input = "quit()"; }
+
+                       CommandOptionParser parser(input);
+                       commandName = parser.getCommandString();
+                       options = parser.getOptionString();
+                                                                               
+                       if (commandName != "") {
 
+                               //executes valid command
+                               CommandFactory cFactory;
+                               Command* command = cFactory.getCommand(commandName, options);
+                               quitCommandCalled = command->execute();
+                       }else {         
+                               mothurOut("Invalid."); 
+                               mothurOutEndLine();
+                       }
+                       
+               }
+               
+               return 1;
+       }
+       catch(exception& e) {
+               errorOut(e, "ScriptEngine", "getInput");
+               exit(1);
+       }
+}
+/***********************************************************************/
+string ScriptEngine::getNextCommand(string& commandString) {
+       try {
+               string nextcommand = "";
+               int count = 0;
+               
+               //go through string until you reach ; or end
+               while (count < commandString.length()) { 
+                       
+                       if (commandString[count] == ';') {  break;   }
+                       else {          nextcommand += commandString[count];    }
+                       
+                       count++;
+               }
+               
+               //if you are not at the end
+               if (count != commandString.length())  {   commandString = commandString.substr(count+1, commandString.length());  }
+               else { commandString = ""; }
+                               
+               
+               //get rid of spaces in between commands if any
+               if (commandString.length() > 0) {
+                       while (commandString[0] == ' ') {  
+                               commandString = commandString.substr(1,commandString.length());
+                               if (commandString.length() == 0) {  break;  }
+                       }
+               }
+                                       
+               return nextcommand;
+       }
+       catch(exception& e) {
+               errorOut(e, "ScriptEngine", "getNextCommand");
+               exit(1);
+       }
+}
+/***********************************************************************/