* Fix later, don't have time now.
*
*/
-using namespace std;
-#include "utilities.hpp"
-#include "globaldata.hpp"
-#include "commandoptionparser.hpp"
-#include "command.hpp"
-#include "commandfactory.hpp"
-#include "errorchecking.h"
#include "engine.hpp"
/***********************************************************************/
-InteractEngine::InteractEngine(){
+InteractEngine::InteractEngine(string path){
globaldata = GlobalData::getInstance();
-
+ globaldata->argv = path;
+
system("clear");
// char buffer = ' ';
// ifstream header("introtext.txt");
try {
string input = "";
string commandName = "";
+ string options = "";
int quitCommandCalled = 0;
- bool errorFree;
- ErrorCheck* errorCheckor = new ErrorCheck();
+ //bool errorFree;
+ //ErrorCheck* errorCheckor = new ErrorCheck();
- cout << "mothur v1.0" << endl;
- cout << "Last updated: 1/29/2009" << endl << endl;
+ cout << "mothur v.1.3.0" << endl;
+ cout << "Last updated: 5/29/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()"; }
- errorFree = errorCheckor->checkInput(input);
- if (errorFree == true) {
- CommandOptionParser parser(input);
- commandName = parser.getCommandString();
+ //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();
+ options = parser.getOptionString();
+
+ if (commandName != "") {
//executes valid command
CommandFactory cFactory;
- Command* command = cFactory.getCommand(commandName);
+ Command* command = cFactory.getCommand(commandName, options);
quitCommandCalled = command->execute();
-
+
}else {
- cout << "Your input contains errors. Please try again." << endl;
+ cout << "Your input contains errors. Please try again." << endl;
}
}
return 1;
/***********************************************************************/
//This function opens the batchfile to be used by BatchEngine::getInput.
-BatchEngine::BatchEngine(string batchFileName){
+BatchEngine::BatchEngine(string path, string batchFileName){
try {
globaldata = GlobalData::getInstance();
openedBatch = openInputFile(batchFileName, inputBatchFile);
+ globaldata->argv = path;
system("clear");
//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;
- ErrorCheck* errorCheckor = new ErrorCheck();
-
- CommandFactory cFactory;
+ string options = "";
+
+ //CommandFactory cFactory;
int quitCommandCalled = 0;
while(quitCommandCalled == 0){
- getline(inputBatchFile, input);
if (inputBatchFile.eof()) { input = "quit()"; }
+ else { getline(inputBatchFile, input); }
- cout << endl << "mothur > " << input << endl;
- errorFree = errorCheckor->checkInput(input);
- if (errorFree == true) {
+ if (input[0] != '#') {
+
+ cout << endl << "mothur > " << input << endl;
+
+ //allow user to omit the () on the quit command
+ if (input == "quit") { input = "quit()"; }
+
CommandOptionParser parser(input);
commandName = parser.getCommandString();
- ifstream filehandle;
-
- if (openedBatch == 0) { //able to open batchfile
+ options = parser.getOptionString();
+
+ if (commandName != "") {
+
//executes valid command
CommandFactory cFactory;
- Command* command = cFactory.getCommand(commandName);
+ Command* command = cFactory.getCommand(commandName, options);
quitCommandCalled = command->execute();
- }
- else {
- cout << "Invalid." << endl;
- }
- }
- else {
- cout << "Unable to open batchfile." << endl;
+ }else { cout << "Invalid." << endl; }
+
}
+ gobble(inputBatchFile);
}
return 1;
}