X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=ac49206040520592a212b68594305cf464494155;hb=b1ac9e686514752c0aa7df045a3b2ab70ceaec89;hp=23e3f6e119af2add01b95aa0d8c41f710b9b0a96;hpb=d873f7bf94309317a08c8757e0d0d60b06fbd473;p=mothur.git diff --git a/engine.cpp b/engine.cpp index 23e3f6e..ac49206 100644 --- a/engine.cpp +++ b/engine.cpp @@ -138,28 +138,30 @@ bool BatchEngine::getInput(){ 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; + 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; }