X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;fp=engine.cpp;h=f128c4684040346110d519c56f45c9506e953866;hb=65f2be9d8f9b4cf72b4aafd800fdd11ad26435fd;hp=dbdcc36300f2fd5d3f5ea6135dbc8666f328bba0;hpb=92de7f976371d41441ad41f02ca83af8b43cef5c;p=mothur.git diff --git a/engine.cpp b/engine.cpp index dbdcc36..f128c46 100644 --- a/engine.cpp +++ b/engine.cpp @@ -179,6 +179,13 @@ bool InteractEngine::getInput(){ //cout << pid << " is in execute " << commandName << endl; #endif //executes valid command + mout->runParse = true; + mout->Groups.clear(); + mout->namesOfGroups.clear(); + mout->Treenames.clear(); + mout->names.clear(); + mout->saveNextLabel = ""; + Command* command = cFactory->getCommand(commandName, options); quitCommandCalled = command->execute(); @@ -353,6 +360,13 @@ bool BatchEngine::getInput(){ if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) { #endif //executes valid command + mout->runParse = true; + mout->Groups.clear(); + mout->namesOfGroups.clear(); + mout->Treenames.clear(); + mout->names.clear(); + mout->saveNextLabel = ""; + Command* command = cFactory->getCommand(commandName, options); quitCommandCalled = command->execute(); @@ -455,9 +469,11 @@ bool ScriptEngine::getInput(){ if (input == "") { input = "quit()"; } - mout->mothurOutEndLine(); - mout->mothurOut("mothur > " + input); - mout->mothurOutEndLine(); + if ((!mout->gui) || (input != "quit()")) { + mout->mothurOutEndLine(); + mout->mothurOut("mothur > " + input); + mout->mothurOutEndLine(); + } #ifdef USE_MPI //send commandName @@ -505,6 +521,13 @@ bool ScriptEngine::getInput(){ //cout << pid << " is in execute" << endl; #endif //executes valid command + mout->runParse = true; + mout->Groups.clear(); + mout->namesOfGroups.clear(); + mout->Treenames.clear(); + mout->names.clear(); + mout->saveNextLabel = ""; + Command* command = cFactory->getCommand(commandName, options); quitCommandCalled = command->execute();