bool errorFree;
ErrorCheck* errorCheckor = new ErrorCheck();
- cout << "mothur v1.2.0" << endl;
- cout << "Last updated: 4/14/2009" << endl << endl;
+ cout << "mothur v.1.3.0" << endl;
+ cout << "Last updated: 4/25/2009" << endl << endl;
cout << "by" << endl;
cout << "Patrick D. Schloss" << endl << endl;
cout << "Department of Microbiology" << endl;
getline(cin, input);
if (cin.eof()) { 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);
//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; }
+
string input = "";
string commandName = "";
bool errorFree;
while(quitCommandCalled == 0){
getline(inputBatchFile, input);
- if (inputBatchFile.eof()) { input = "quit()"; }
+ if (input[0] != '#') {
+ if (inputBatchFile.eof()) { input = "quit()"; }
- cout << endl << "mothur > " << input << endl;
- errorFree = errorCheckor->checkInput(input);
- if (errorFree == true) {
- CommandOptionParser parser(input);
- commandName = parser.getCommandString();
- ifstream filehandle;
+ cout << endl << "mothur > " << input << endl;
+
+ //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();
+ ifstream filehandle;
- if (openedBatch == 0) { //able to open batchfile
- //executes valid command
- CommandFactory cFactory;
- Command* command = cFactory.getCommand(commandName);
- quitCommandCalled = command->execute();
+ if (openedBatch == 0) { //able to open batchfile
+ //executes valid command
+ CommandFactory cFactory;
+ Command* command = cFactory.getCommand(commandName);
+ quitCommandCalled = command->execute();
+ }
+ else {
+ cout << "Invalid." << endl;
+ }
}
else {
- cout << "Invalid." << endl;
+ cout << "Unable to open batchfile." << endl;
}
- }
- else {
- cout << "Unable to open batchfile." << endl;
- }
+ }else { if (inputBatchFile.eof()) { input = "quit()"; } }
}
return 1;
}