X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=ea1c0e14dc9f89fe0157d24828a2e9552297389c;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=469ff404011283d81e8744d1072e59bdacdb656b;hpb=dbcb14c17c128987e59147f510950f32dbeb6698;p=mothur.git

diff --git a/engine.cpp b/engine.cpp
index 469ff40..ea1c0e1 100644
--- a/engine.cpp
+++ b/engine.cpp
@@ -180,15 +180,19 @@ 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(); }
@@ -222,7 +226,7 @@ string Engine::getCommand()  {
 				
 				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);
 				}	
 				
@@ -362,15 +366,20 @@ 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(); }
@@ -401,7 +410,7 @@ bool BatchEngine::getInput(){
 /***********************************************************************/
 string BatchEngine::getNextCommand(ifstream& inputBatchFile) {
 	try {
-		
+			
 		string nextcommand = "";
 		
 		if (inputBatchFile.eof()) { nextcommand = "quit()"; }
@@ -526,15 +535,19 @@ 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(); }