mout->mothurOutEndLine();
input = getCommand();
- mout->mothurOutEndLine();
+ mout->mothurOutEndLine();
+
+ if (mout->control_pressed) { input = "quit()"; }
//allow user to omit the () on the quit command
if (input == "quit") { input = "quit()"; }
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
Command* command = cFactory->getCommand(commandName, options);
quitCommandCalled = command->execute();
mout->control_pressed = 0;
+ mout->executing = false;
+ #ifdef USE_MPI
+ }
+ #endif
}else {
mout->mothurOut("Your input contains errors. Please try again.");
mout->mothurOutEndLine();
if(nextCommand != NULL) { add_history(nextCommand); }
else{ //^D causes null string and we want it to quit mothur
nextCommand = "quit";
- cout << nextCommand << endl;
+ mout->mothurOut(nextCommand);
}
mout->mothurOutJustToLog("mothur > " + toString(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("mothur > " + toString(nextCommand));
- return nextCommand;
+ string nextCommand = "";
+
+ mout->mothurOut("mothur > ");
+ getline(cin, nextCommand);
+ mout->mothurOutJustToLog(toString(nextCommand));
+
+ return nextCommand;
#endif
-
- mout->mothurOutEndLine();
+
}
catch(exception& e) {
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()"; }
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
Command* command = cFactory->getCommand(commandName, options);
quitCommandCalled = command->execute();
mout->control_pressed = 0;
+ mout->executing = false;
+
+ #ifdef USE_MPI
+ }
+ #endif
}else {
mout->mothurOut("Invalid.");
mout->mothurOutEndLine();
if (input == "") { input = "quit()"; }
-
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()"; }
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
Command* command = cFactory->getCommand(commandName, options);
quitCommandCalled = command->execute();
mout->control_pressed = 0;
+ mout->executing = false;
+
+ #ifdef USE_MPI
+ }
+ #endif
}else {
mout->mothurOut("Invalid.");
mout->mothurOutEndLine();