X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=catchallcommand.cpp;h=a914f733caef6f3535bfe88a4ff532a2989f7971;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hp=584f798d30d51155b439064bbf2fafb1b693ad64;hpb=deba0af0ccdcb6005ed5b2b82649b137c63fbdf7;p=mothur.git diff --git a/catchallcommand.cpp b/catchallcommand.cpp index 584f798..a914f73 100644 --- a/catchallcommand.cpp +++ b/catchallcommand.cpp @@ -80,6 +80,7 @@ CatchAllCommand::CatchAllCommand(){ outputTypes["models"] = tempOutNames; outputTypes["bubble"] = tempOutNames; outputTypes["summary"] = tempOutNames; + outputTypes["sabund"] = tempOutNames; } catch(exception& e) { m->errorOut(e, "CatchAllCommand", "CatchAllCommand"); @@ -118,6 +119,7 @@ CatchAllCommand::CatchAllCommand(string option) { outputTypes["models"] = tempOutNames; outputTypes["bubble"] = tempOutNames; outputTypes["summary"] = tempOutNames; + outputTypes["sabund"] = tempOutNames; //if the user changes the input directory command factory will send this info to us in the output parameter @@ -237,7 +239,7 @@ int CatchAllCommand::execute() { catchAllTest = m->getFullPathName(catchAllTest); #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) - catchAllCommandExe += "mono " + catchAllTest + " "; + catchAllCommandExe += "mono \"" + catchAllTest + "\" "; #else catchAllCommandExe += "\"" + catchAllTest + "\" "; #endif @@ -291,7 +293,7 @@ int CatchAllCommand::execute() { //create system command string catchAllCommand = ""; #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) - catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1"; + catchAllCommand += catchAllCommandExe + "\"" + filename + "\" \"" + outputPath + + "\" 1"; #else //removes extra '\\' catchall doesnt like that vector tempNames; @@ -354,7 +356,7 @@ int CatchAllCommand::execute() { //create system command string catchAllCommand = ""; #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) - catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1"; + catchAllCommand += catchAllCommandExe + "\"" + filename + "\" \"" + outputPath + + "\" 1"; #else //removes extra '\\' catchall doesnt like that vector tempNames; @@ -439,7 +441,7 @@ int CatchAllCommand::execute() { //create system command string catchAllCommand = ""; #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) - catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1"; + catchAllCommand += catchAllCommandExe + "\"" + filename + "\" \"" + outputPath + + "\" 1"; #else //removes extra '\\' catchall doesnt like that vector tempNames;