X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=811236003b5089171536c7e075b10b506baf670a;hb=4ba6188707e67c638ea5ee3c787d5d07ccd07e3e;hp=d5192bf87b50a98a76e971305cd68a96e8750a0b;hpb=74c78f9abd9e733f0c2f812efec97a76632fcbf8;p=mothur.git

diff --git a/engine.cpp b/engine.cpp
index d5192bf..8112360 100644
--- a/engine.cpp
+++ b/engine.cpp
@@ -14,26 +14,18 @@
 
 #include "engine.hpp"
 
+
 /***********************************************************************/
 
 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();
-//	}
 }
 
 /***********************************************************************/
 
-InteractEngine::~InteractEngine(){
-	}
+InteractEngine::~InteractEngine(){}
 
 /***********************************************************************/
 //This function allows the user to input commands one line at a time until they quit.
@@ -42,149 +34,258 @@ bool InteractEngine::getInput(){
 	try {
 		string input = "";
 		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 > ";
-			getline(cin, input);
-			if (cin.eof()) { input = "quit()"; }
+			
+			mothurOutEndLine();
+			
+			input = getCommand();			
+			
+			mothurOutJustToLog("mothur > " + 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();
+			CommandOptionParser parser(input);
+			commandName = parser.getCommandString();
+	
+			options = parser.getOptionString();
+			
+			if (commandName != "") {
 			
 				//executes valid command
-				CommandFactory cFactory;
-				Command* command = cFactory.getCommand(commandName);
+				Command* command = cFactory->getCommand(commandName, options);
 				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";
+}
+/***********************************************************************/
+string Engine::getCommand()  {
+	try {
+		char* nextCommand = NULL;
+		
+		nextCommand = readline("mothur > ");
+		if(nextCommand != NULL) {  add_history(nextCommand);  }
+						
+		return nextCommand;
+	}
+	catch(exception& e) {
+		errorOut(e, "Engine", "getCommand");
+		exit(1);
+	}
+}
+/***********************************************************************/
+void Engine::terminateCommand(int dummy)  {
+	try {
+		mothurOut("Stopping command."); mothurOutEndLine();
+		cFactory->getCommand();  //terminates command
+	}
+	catch(exception& e) {
+		errorOut(e, "Engine", "terminateCommand");
 		exit(1);
 	}
-
 }
-
 /***********************************************************************/
 //This function opens the batchfile to be used by BatchEngine::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);
 	}
 }
 
 /***********************************************************************/
 
-BatchEngine::~BatchEngine(){
-	}
+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; }
+		if (openedBatch == 1) {  
+			mothurOut("unable to open batchfile");  
+			mothurOutEndLine();
+			return 1; 
+		}
 	
 		string input = "";
 		string commandName = "";
-		bool errorFree;
-		ErrorCheck* errorCheckor = new ErrorCheck();
-
-		CommandFactory cFactory;
+		string options = "";
+		
+		//CommandFactory cFactory;
 		int quitCommandCalled = 0;
 	
 		while(quitCommandCalled == 0){
-		
-			getline(inputBatchFile, input);
-			if (input[0] != '#') {
-				if (inputBatchFile.eof()) { input = "quit()"; }
+	
+			if (inputBatchFile.eof()) { input = "quit()"; }
+			else { input = getline(inputBatchFile); }
 			
-				cout << endl << "mothur > " << input << endl;
+			if (input[0] != '#') {
+				
+				mothurOutEndLine();
+				mothurOut("mothur > " + 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();
-					ifstream filehandle;
-		
-					if (openedBatch == 0) { //able to open batchfile
-						//executes valid command
-						CommandFactory cFactory;
-						Command* command = cFactory.getCommand(commandName);
-						quitCommandCalled = command->execute();
-					}
-					else {
-						cout << "Invalid." << endl;
-					}
-				}
-				else {
-					cout << "Unable to open batchfile." << endl;
+				CommandOptionParser parser(input);
+				commandName = parser.getCommandString();
+				options = parser.getOptionString();
+										
+				if (commandName != "") {
+
+					//executes valid command
+					Command* command = cFactory->getCommand(commandName, options);
+					quitCommandCalled = command->execute();
+				}else {		
+					mothurOut("Invalid."); 
+					mothurOutEndLine();
 				}
-			}else { if (inputBatchFile.eof()) { input = "quit()"; } }
+				
+			}
+			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
+				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);
+	}
+}
+/***********************************************************************/