working on get.coremicrobiom

[mothur.git] / engine.cpp

diff --git a/engine.cpp b/engine.cpp
index 670af78757abf5ac2b25ff2adcd4c7b41257e9ee..24adcb53b59f39f049269d74b4da953a5f387262 100644 (file)
--- a/engine.cpp
+++ b/engine.cpp
@@ -34,7 +34,7 @@ string Engine::findMothursPath(){
                
                //delimiting path char
                char delim;
-               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                        delim = ':';
                #else
                        delim = ';';
@@ -56,7 +56,7 @@ string Engine::findMothursPath(){
                
                if (mothurPath != "") {
                        //add mothur so it looks like what argv would look like
-                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                                mothurPath += "/mothur";
                        #else
                                mothurPath += "\\mothur";
@@ -71,7 +71,7 @@ string Engine::findMothursPath(){
                                //is this mothurs path?
                                ifstream in;
                                string tempIn = dirs[i];
-                               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                                        tempIn += "/mothur";
                                #else
                                        tempIn += "\\mothur";
@@ -183,14 +183,15 @@ bool InteractEngine::getInput(){
                                        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(); }
@@ -217,7 +218,7 @@ bool InteractEngine::getInput(){
 string Engine::getCommand()  {
        try {
        
-               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                        #ifdef USE_READLINE
                                char* nextCommand = NULL;
                                nextCommand = readline("mothur > ");
@@ -367,15 +368,16 @@ bool BatchEngine::getInput(){
                                        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(); }
@@ -534,15 +536,15 @@ bool ScriptEngine::getInput(){
                                        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(); }