X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=48f782ab2a590d71a292e7b83125ba8ce0f3fffe;hb=6c2b1e530a5c0bb87040e58a3e410097acdfcc3d;hp=d595be332eed785c27037710396d1a7dd46c845e;hpb=82bf18e3ef0a52345519f91a682e64cc385b56bb;p=mothur.git

diff --git a/engine.cpp b/engine.cpp
index d595be3..48f782a 100644
--- a/engine.cpp
+++ b/engine.cpp
@@ -26,71 +26,7 @@ Engine::Engine(){
 	}
 }
 /***********************************************************************/
-string Engine::findMothursPath(){
-	try { 
-		
-		string envPath = getenv("PATH");
-		string mothurPath = "";
-		
-		//delimiting path char
-		char delim;
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
-			delim = ':';
-		#else
-			delim = ';';
-		#endif
-		
-		//break apart path variable by ':'
-		vector<string> dirs;
-		mout->splitAtChar(envPath, dirs, delim);
-		
-		//get path related to mothur
-		for (int i = 0; i < dirs.size(); i++) {
-			//to lower so we can find it
-			string tempLower = "";
-			for (int j = 0; j < dirs[i].length(); j++) {  tempLower += tolower(dirs[i][j]);  }
-			
-			//is this mothurs path?
-			if (tempLower.find("mothur") != -1) {  mothurPath = dirs[i]; break;  }
-		}
-		
-		if (mothurPath != "") {
-			//add mothur so it looks like what argv would look like
-			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
-				mothurPath += "/mothur";
-			#else
-				mothurPath += "\\mothur";
-			#endif
-		}else {
-			//okay mothur is not in the path, so the folder mothur is in must be in the path
-			//lets find out which one
-			
-			//get path related to mothur
-			for (int i = 0; i < dirs.size(); i++) {
-								
-				//is this mothurs path?
-				ifstream in;
-				string tempIn = dirs[i];
-				#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
-					tempIn += "/mothur";
-				#else
-					tempIn += "\\mothur";
-				#endif
-				mout->openInputFile(tempIn, in, "");
-				
-				//if this file exists
-				if (in) { in.close(); mothurPath = tempIn;  break;  }
-			}
-		}
-		
-		return mothurPath;
-		
-	}
-	catch(exception& e) {
-		mout->errorOut(e, "Engine", "findMothursPath");
-		exit(1);
-	}
-}
+
 /***********************************************************************/
 
 InteractEngine::InteractEngine(string path){
@@ -99,7 +35,7 @@ InteractEngine::InteractEngine(string path){
 	string temppath = path.substr(0, (path.find_last_of("othur")-5));
 	
 	//this will happen if you set the path variable to contain mothur's exe location
-	if (temppath == "") { path = findMothursPath(); }
+	if (temppath == "") { path = mout->findProgramPath("mothur"); }
 	
 	mout->argv = path;
 }
@@ -180,14 +116,18 @@ bool InteractEngine::getInput(){
 					#endif
 					//executes valid command
 					mout->runParse = true;
-					mout->Groups.clear();
-					mout->namesOfGroups.clear();
+					mout->clearGroups();
+					mout->clearAllGroups();
 					mout->Treenames.clear();
-					mout->names.clear();
 					mout->saveNextLabel = "";
+					mout->printedHeaders = false;
+					mout->commandInputsConvertError = false;
+					mout->currentBinLabels.clear();
+					mout->binLabelsInFile.clear();
 							
 					Command* command = cFactory->getCommand(commandName, options);
-					quitCommandCalled = command->execute();
+					if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+					else { quitCommandCalled = command->execute(); }
 							
 					//if we aborted command
 					if (quitCommandCalled == 2) {  mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }
@@ -214,14 +154,14 @@ bool InteractEngine::getInput(){
 string Engine::getCommand()  {
 	try {
 	
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 			#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
-					strcpy(nextCommand, "quit"); 
+					nextCommand = strdup("quit");
 					mout->mothurOut(nextCommand);
 				}	
 				
@@ -262,7 +202,7 @@ BatchEngine::BatchEngine(string path, string batchFileName){
 		string temppath = path.substr(0, (path.find_last_of("othur")-5));
 	
 		//this will happen if you set the path variable to contain mothur's exe location
-		if (temppath == "") { path = findMothursPath(); }
+		if (temppath == "") { path = mout->findProgramPath("mothur"); }
 		
 		mout->argv = path;
 				
@@ -361,14 +301,19 @@ bool BatchEngine::getInput(){
 					#endif
 					//executes valid command
 					mout->runParse = true;
-					mout->Groups.clear();
-					mout->namesOfGroups.clear();
+					mout->clearGroups();
+					mout->clearAllGroups();
 					mout->Treenames.clear();
-					mout->names.clear();
 					mout->saveNextLabel = "";
+					mout->printedHeaders = false;
+					mout->commandInputsConvertError = false;
+					mout->currentBinLabels.clear();
+					mout->binLabelsInFile.clear();
+
 							
 					Command* command = cFactory->getCommand(commandName, options);
-					quitCommandCalled = command->execute();
+					if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+					else { quitCommandCalled = command->execute(); }
 							
 					//if we aborted command
 					if (quitCommandCalled == 2) {  mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }
@@ -399,7 +344,7 @@ bool BatchEngine::getInput(){
 /***********************************************************************/
 string BatchEngine::getNextCommand(ifstream& inputBatchFile) {
 	try {
-		
+			
 		string nextcommand = "";
 		
 		if (inputBatchFile.eof()) { nextcommand = "quit()"; }
@@ -425,7 +370,7 @@ ScriptEngine::ScriptEngine(string path, string commandString){
 		string temppath = path.substr(0, (path.find_last_of("othur")-5));
 
 		//this will happen if you set the path variable to contain mothur's exe location
-		if (temppath == "") { path = findMothursPath(); }
+		if (temppath == "") { path = mout->findProgramPath("mothur"); }
 		
 		mout->argv = path;
 				
@@ -524,14 +469,18 @@ bool ScriptEngine::getInput(){
 					#endif
 					//executes valid command
 					mout->runParse = true;
-					mout->Groups.clear();
-					mout->namesOfGroups.clear();
+					mout->clearGroups();
+					mout->clearAllGroups();
 					mout->Treenames.clear();
-					mout->names.clear();
 					mout->saveNextLabel = "";
-							
+					mout->printedHeaders = false;
+					mout->commandInputsConvertError = false;
+					mout->currentBinLabels.clear();
+					mout->binLabelsInFile.clear();
+
 					Command* command = cFactory->getCommand(commandName, options);
-					quitCommandCalled = command->execute();
+					if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+					else { quitCommandCalled = command->execute(); }
 					
 					//if we aborted command
 					if (quitCommandCalled == 2) {  mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }