exit(1);
}
}
-
+/***********************************************************************/
+string Engine::findMothursPath(){
+ try {
+
+ string envPath = getenv("PATH");
+ string mothurPath = "";
+
+ //delimiting path char
+ char delim;
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ delim = ':';
+ #else
+ delim = ';';
+ #endif
+
+ //break apart path variable by ':'
+ vector<string> dirs;
+ mout->splitAtChar(envPath, dirs, delim);
+
+ //get path related to mothur
+ for (int i = 0; i < dirs.size(); i++) {
+ //to lower so we can find it
+ string tempLower = "";
+ for (int j = 0; j < dirs[i].length(); j++) { tempLower += tolower(dirs[i][j]); }
+
+ //is this mothurs path?
+ if (tempLower.find("mothur") != -1) { mothurPath = dirs[i]; break; }
+ }
+
+ if (mothurPath != "") {
+ //add mothur so it looks like what argv would look like
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ mothurPath += "/mothur";
+ #else
+ mothurPath += "\\mothur";
+ #endif
+ }else {
+ //okay mothur is not in the path, so the folder mothur is in must be in the path
+ //lets find out which one
+
+ //get path related to mothur
+ for (int i = 0; i < dirs.size(); i++) {
+
+ //is this mothurs path?
+ ifstream in;
+ string tempIn = dirs[i];
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ tempIn += "/mothur";
+ #else
+ tempIn += "\\mothur";
+ #endif
+ mout->openInputFile(tempIn, in, "");
+
+ //if this file exists
+ if (in) { in.close(); mothurPath = tempIn; break; }
+ }
+ }
+
+ return mothurPath;
+
+ }
+ catch(exception& e) {
+ mout->errorOut(e, "Engine", "findMothursPath");
+ exit(1);
+ }
+}
/***********************************************************************/
InteractEngine::InteractEngine(string path){
- globaldata = GlobalData::getInstance();
- globaldata->argv = path;
+ string temppath = path.substr(0, (path.find_last_of("othur")-5));
+
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") { path = findMothursPath(); }
+
+ mout->argv = path;
}
/***********************************************************************/
//cout << pid << " is in execute " << commandName << endl;
#endif
//executes valid command
+ mout->runParse = true;
+ mout->clearGroups();
+ mout->clearAllGroups();
+ mout->Treenames.clear();
+ mout->names.clear();
+ mout->saveNextLabel = "";
+ mout->printedHeaders = false;
+ mout->commandInputsConvertError = false;
+ mout->currentBinLabels.clear();
+ mout->binLabelsInFile.clear();
+
Command* command = cFactory->getCommand(commandName, options);
- quitCommandCalled = command->execute();
+ if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+ else { quitCommandCalled = command->execute(); }
+
+ //if we aborted command
+ if (quitCommandCalled == 2) { mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }
+
mout->control_pressed = 0;
mout->executing = false;
if(nextCommand != NULL) { add_history(nextCommand); }
else{ //^D causes null string and we want it to quit mothur
- nextCommand = "quit";
+ nextCommand = strdup("quit");
mout->mothurOut(nextCommand);
}
//This function opens the batchfile to be used by BatchEngine::getInput.
BatchEngine::BatchEngine(string path, string batchFileName){
try {
- globaldata = GlobalData::getInstance();
- openedBatch = openInputFile(batchFileName, inputBatchFile);
- globaldata->argv = path;
+ openedBatch = mout->openInputFile(batchFileName, inputBatchFile);
+
+ string temppath = path.substr(0, (path.find_last_of("othur")-5));
+
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") { path = findMothursPath(); }
+
+ mout->argv = path;
}
catch(exception& e) {
//CommandFactory cFactory;
int quitCommandCalled = 0;
int count = 0;
- while(quitCommandCalled == 0){
+ while(quitCommandCalled != 1){
#ifdef USE_MPI
int pid, processors;
if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
#endif
//executes valid command
+ mout->runParse = true;
+ mout->clearGroups();
+ mout->clearAllGroups();
+ mout->Treenames.clear();
+ mout->names.clear();
+ mout->saveNextLabel = "";
+ mout->printedHeaders = false;
+ mout->commandInputsConvertError = false;
+ mout->currentBinLabels.clear();
+ mout->binLabelsInFile.clear();
+
+
Command* command = cFactory->getCommand(commandName, options);
- quitCommandCalled = command->execute();
+ if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+ else { quitCommandCalled = command->execute(); }
+
+ //if we aborted command
+ if (quitCommandCalled == 2) { mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }
+
mout->control_pressed = 0;
mout->executing = false;
}
}
- gobble(inputBatchFile);
+ mout->gobble(inputBatchFile);
}
inputBatchFile.close();
/***********************************************************************/
string BatchEngine::getNextCommand(ifstream& inputBatchFile) {
try {
-
+
string nextcommand = "";
if (inputBatchFile.eof()) { nextcommand = "quit()"; }
- else { nextcommand = getline(inputBatchFile); }
+ else { nextcommand = mout->getline(inputBatchFile); }
return nextcommand;
}
//This function opens the batchfile to be used by BatchEngine::getInput.
ScriptEngine::ScriptEngine(string path, string commandString){
try {
- globaldata = GlobalData::getInstance();
//remove quotes
listOfCommands = commandString.substr(1, (commandString.length()-1));
+
+ string temppath = path.substr(0, (path.find_last_of("othur")-5));
- globaldata->argv = path;
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") { path = findMothursPath(); }
+
+ mout->argv = path;
}
catch(exception& e) {
//CommandFactory cFactory;
int quitCommandCalled = 0;
- while(quitCommandCalled == 0){
+ while(quitCommandCalled != 1){
#ifdef USE_MPI
int pid, processors;
if (input == "") { input = "quit()"; }
- mout->mothurOutEndLine();
- mout->mothurOut("mothur > " + input);
- mout->mothurOutEndLine();
+ if (mout->gui) {
+ if ((input.find("quit") != string::npos) || (input.find("set.logfile") != string::npos)) {}
+ else if ((input.find("get.current") != string::npos) && (!mout->hasCurrentFiles())) {}
+ else { mout->mothurOutEndLine(); mout->mothurOut("mothur > " + input); mout->mothurOutEndLine(); }
+ }else{
+ mout->mothurOutEndLine(); mout->mothurOut("mothur > " + input); mout->mothurOutEndLine();
+ }
#ifdef USE_MPI
//send commandName
mout->executing = true;
#ifdef USE_MPI
int pid, numProcesses;
- MPI_Status status;
MPI_Comm_rank(MPI_COMM_WORLD, &pid);
MPI_Comm_size(MPI_COMM_WORLD, &numProcesses);
//cout << pid << " is in execute" << endl;
#endif
//executes valid command
+ mout->runParse = true;
+ mout->clearGroups();
+ mout->clearAllGroups();
+ mout->Treenames.clear();
+ mout->names.clear();
+ mout->saveNextLabel = "";
+ mout->printedHeaders = false;
+ mout->commandInputsConvertError = false;
+ mout->currentBinLabels.clear();
+ mout->binLabelsInFile.clear();
+
Command* command = cFactory->getCommand(commandName, options);
- quitCommandCalled = command->execute();
+ if (mout->commandInputsConvertError) { quitCommandCalled = 2; }
+ else { quitCommandCalled = command->execute(); }
+
+ //if we aborted command
+ if (quitCommandCalled == 2) { mout->mothurOut("[ERROR]: did not complete " + commandName + "."); mout->mothurOutEndLine(); }
+
mout->control_pressed = 0;
mout->executing = false;
string nextcommand = "";
int count = 0;
+ bool ignoreSemiColons = false;
//go through string until you reach ; or end
while (count < commandString.length()) {
- if (commandString[count] == ';') { break; }
+ //you want to ignore any ; until you reach the next '
+ if ((commandString[count] == '\'') && (!ignoreSemiColons)) { ignoreSemiColons = true; }
+ else if ((commandString[count] == '\'') && (ignoreSemiColons)) { ignoreSemiColons = false; }
+
+ if ((commandString[count] == ';') && (!ignoreSemiColons)) { break; }
else { nextcommand += commandString[count]; }
count++;
projects / mothur.git / blobdiff