X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=9e5801b1b057b2f2a1cc4a986e105ae3e73f14b5;hb=8130a55348ef2b5f431fe47c6a83aae581e244b5;hp=03422e20790a96159eaa68ad569ae4a15a5d94aa;hpb=786d5631d9cd5baa6ed6ef16f8b4b384cbc7470f;p=mothur.git

diff --git a/engine.cpp b/engine.cpp
index 03422e2..9e5801b 100644
--- a/engine.cpp
+++ b/engine.cpp
@@ -14,6 +14,18 @@
 
 #include "engine.hpp"
 
+/***********************************************************************/
+Engine::Engine(){
+	try {
+		cFactory = CommandFactory::getInstance();
+		mout = MothurOut::getInstance();
+	}
+	catch(exception& e) {
+		mout->errorOut(e, "Engine", "Engine");
+		exit(1);
+	}
+}
+
 /***********************************************************************/
 
 InteractEngine::InteractEngine(string path){
@@ -21,19 +33,11 @@ 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.
@@ -44,60 +48,95 @@ 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 > ";
-			getline(cin, input);
-			if (cin.eof()) { input = "quit()"; }
+			mout->mothurOutEndLine();
+			
+			input = getCommand();	
+			mout->mothurOutEndLine();	
+			
+			if (mout->control_pressed) { 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);
 			commandName = parser.getCommandString();
+	
 			options = parser.getOptionString();
 			
 			if (commandName != "") {
-			
+				mout->executing = true;
+				
+				#ifdef USE_MPI
+					int pid;
+					MPI_Comm_rank(MPI_COMM_WORLD, &pid); 
+					
+					if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+				#endif
 				//executes valid command
-				CommandFactory cFactory;
-				Command* command = cFactory.getCommand(commandName, options);
+				Command* command = cFactory->getCommand(commandName, options);
 				quitCommandCalled = command->execute();
+				mout->control_pressed = 0;
+				mout->executing = false;
 				
+				#ifdef USE_MPI
+					}
+				#endif
 			}else {
-				cout << "Your input contains errors. Please try again." << endl;
+				mout->mothurOut("Your input contains errors. Please try again."); 
+				mout->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";
+		mout->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 {
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+			#ifdef USE_READLINE
+				char* nextCommand = NULL;
+				nextCommand = readline("mothur > ");
+				
+				if(nextCommand != NULL) {  add_history(nextCommand);  }	
+				else{ //^D causes null string and we want it to quit mothur
+					nextCommand = "quit"; 
+					mout->mothurOut(nextCommand);
+				}	
+				
+				mout->mothurOutJustToLog("mothur > " + toString(nextCommand));
+				return nextCommand;
+			#else
+				string nextCommand = "";
+				mout->mothurOut("mothur > ");
+				getline(cin, nextCommand);
+				mout->mothurOutJustToLog("mothur > " + toString(nextCommand));
+				
+				return nextCommand;
+			#endif
+		#else
+				string nextCommand = "";
+				
+				mout->mothurOut("mothur > ");
+				getline(cin, nextCommand);
+				mout->mothurOutJustToLog(toString(nextCommand));
+				
+				return nextCommand;
+		#endif
+	
+						
+	}
+	catch(exception& e) {
+		mout->errorOut(e, "Engine", "getCommand");
 		exit(1);
 	}
-
 }
-
 /***********************************************************************/
 //This function opens the batchfile to be used by BatchEngine::getInput.
 BatchEngine::BatchEngine(string path, string batchFileName){
@@ -106,56 +145,48 @@ BatchEngine::BatchEngine(string path, string batchFileName){
 	
 		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";
+		mout->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) {  
+			mout->mothurOut("unable to open batchfile");  
+			mout->mothurOutEndLine();
+			return 1; 
+		}
 	
 		string input = "";
 		string commandName = "";
 		string options = "";
-		//int count = 1;
 		
 		//CommandFactory cFactory;
 		int quitCommandCalled = 0;
 	
 		while(quitCommandCalled == 0){
-		
+	
 			if (inputBatchFile.eof()) { input = "quit()"; }
-			else { getline(inputBatchFile, input); }
-			
-			//cout << "command number" << count << endl; count++;
+			else { input = getline(inputBatchFile); }
 			
 			if (input[0] != '#') {
-			
-				cout << endl << "mothur > " << input << endl;
+				
+				mout->mothurOutEndLine();
+				mout->mothurOut("mothur > " + input);
+				mout->mothurOutEndLine();
+							
+				if (mout->control_pressed) { input = "quit()"; }
 				
 				//allow user to omit the () on the quit command
 				if (input == "quit") { input = "quit()"; }
@@ -165,24 +196,36 @@ bool BatchEngine::getInput(){
 				options = parser.getOptionString();
 										
 				if (commandName != "") {
-
+					mout->executing = true;
+					#ifdef USE_MPI
+						int pid;
+						MPI_Comm_rank(MPI_COMM_WORLD, &pid); 
+					
+						if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+					#endif
 					//executes valid command
-					CommandFactory cFactory;
-					Command* command = cFactory.getCommand(commandName, options);
+					Command* command = cFactory->getCommand(commandName, options);
 					quitCommandCalled = command->execute();
-				}else {		cout << "Invalid." << endl;		}
+					mout->control_pressed = 0;
+					mout->executing = false;
+				
+					#ifdef USE_MPI
+						}
+					#endif
+				}else {		
+					mout->mothurOut("Invalid."); 
+					mout->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";
-		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";
+		mout->errorOut(e, "BatchEngine", "getInput");
 		exit(1);
 	}
 }
@@ -199,34 +242,27 @@ ScriptEngine::ScriptEngine(string path, string commandString){
 		listOfCommands = commandString.substr(1, (commandString.length()-1));
 
 		globaldata->argv = path;
-
-		system("clear");
-	
+				
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the ScriptEngine class Function ScriptEngine. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}
-	catch(...) {
-		cout << "An unknown error has occurred in the ScriptEngine class function ScriptEngine. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		mout->errorOut(e, "ScriptEngine", "ScriptEngine");
 		exit(1);
 	}
 }
 
 /***********************************************************************/
 
-ScriptEngine::~ScriptEngine(){
-	}
+ScriptEngine::~ScriptEngine(){ 	}
 
 /***********************************************************************/
-//This Function allows the user to run a batchfile containing several commands on Dotur
+//This Function allows the user to run a batchfile containing several commands on mothur
 bool ScriptEngine::getInput(){
 	try {
 			
 		string input = "";
 		string commandName = "";
 		string options = "";
-		//int count = 1;
+		
 		
 		//CommandFactory cFactory;
 		int quitCommandCalled = 0;
@@ -236,9 +272,12 @@ bool ScriptEngine::getInput(){
 			input = getNextCommand(listOfCommands);	
 			
 			if (input == "") { input = "quit()"; }
-			//cout << "command number" << count << endl; count++;
 			
-			cout << endl << "mothur > " << input << endl;
+			mout->mothurOutEndLine();
+			mout->mothurOut("mothur > " + input);
+			mout->mothurOutEndLine();
+			
+			if (mout->control_pressed) { input = "quit()"; }
 				
 			//allow user to omit the () on the quit command
 			if (input == "quit") { input = "quit()"; }
@@ -248,23 +287,33 @@ bool ScriptEngine::getInput(){
 			options = parser.getOptionString();
 										
 			if (commandName != "") {
-
+				mout->executing = true;
+				#ifdef USE_MPI
+					int pid;
+					MPI_Comm_rank(MPI_COMM_WORLD, &pid); 
+					
+					if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+				#endif
 				//executes valid command
-				CommandFactory cFactory;
-				Command* command = cFactory.getCommand(commandName, options);
+				Command* command = cFactory->getCommand(commandName, options);
 				quitCommandCalled = command->execute();
-			}else {		cout << "Invalid." << endl;		}
+				mout->control_pressed = 0;
+				mout->executing = false;
+				
+				#ifdef USE_MPI
+					}
+				#endif
+			}else {		
+				mout->mothurOut("Invalid."); 
+				mout->mothurOutEndLine();
+			}
 			
 		}
 		
 		return 1;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the ScriptEngine class Function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}
-	catch(...) {
-		cout << "An unknown error has occurred in the ScriptEngine class function getInput. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		mout->errorOut(e, "ScriptEngine", "getInput");
 		exit(1);
 	}
 }
@@ -272,29 +321,35 @@ bool ScriptEngine::getInput(){
 string ScriptEngine::getNextCommand(string& commandString) {
 	try {
 		string nextcommand = "";
+		int count = 0;
 		
-		nextcommand = commandString.substr(0,commandString.find_first_of(';'));
-
-				
-		if ((commandString.find_first_of(';')+1) <= commandString.length()) {
-			commandString = commandString.substr(commandString.find_first_of(';')+1, commandString.length());
-		}else { commandString = ""; } //you have reached the last command.
+		//go through string until you reach ; or end
+		while (count < commandString.length()) { 
+			
+			if (commandString[count] == ';') {  break;   }
+			else {		nextcommand += commandString[count];	}
+			
+			count++;
+		}
 		
-		//get rid of any extra spaces in between commands
-		//string space = " ";
+		//if you are not at the end
+		if (count != commandString.length())  {   commandString = commandString.substr(count+1, commandString.length());  }
+		else { commandString = ""; }
+				
 		
-		//while(commandString.at(0) == ' ')
-			//commandString = commandString.substr(1, commandString.length());
-			
+		//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) {
-		cout << "Standard Error: " << e.what() << " has occurred in the ScriptEngine class Function getNextCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}
-	catch(...) {
-		cout << "An unknown error has occurred in the ScriptEngine class function getNextCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		mout->errorOut(e, "ScriptEngine", "getNextCommand");
 		exit(1);
 	}
 }
-/***********************************************************************/
\ No newline at end of file
+/***********************************************************************/