X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getcurrentcommand.cpp;h=b9b907d903752d8a93979680d361c2ea683c7cab;hb=7a1e4b563011b1fe4d466d64915a3cb960747125;hp=f73b5600d741d09395eaece04816d6d1859b4ead;hpb=deba0af0ccdcb6005ed5b2b82649b137c63fbdf7;p=mothur.git diff --git a/getcurrentcommand.cpp b/getcurrentcommand.cpp index f73b560..b9b907d 100644 --- a/getcurrentcommand.cpp +++ b/getcurrentcommand.cpp @@ -90,7 +90,9 @@ int GetCurrentCommand::execute(){ try { if (abort == true) { if (calledHelp) { return 0; } return 2; } - + + cFactory = CommandFactory::getInstance(); + //user wants to clear a type if (types.size() != 0) { for (int i = 0; i < types.size(); i++) { @@ -142,6 +144,8 @@ int GetCurrentCommand::execute(){ m->setBiomFile(""); }else if (types[i] == "count") { m->setCountTableFile(""); + }else if (types[i] == "summary") { + m->setSummaryFile(""); }else if (types[i] == "processors") { m->setProcessors("1"); }else if (types[i] == "all") { @@ -156,8 +160,31 @@ int GetCurrentCommand::execute(){ m->mothurOutEndLine(); m->mothurOut("Current files saved by mothur:"); m->mothurOutEndLine(); m->printCurrentFiles(); } + + string inputDir = cFactory->getInputDir(); + if (inputDir != "") { + m->mothurOutEndLine(); m->mothurOut("Current input directory saved by mothur: " + inputDir); m->mothurOutEndLine(); + } + + string outputDir = cFactory->getOutputDir(); + if (outputDir != "") { + m->mothurOutEndLine(); m->mothurOut("Current output directory saved by mothur: " + outputDir); m->mothurOutEndLine(); + } + string defaultPath = m->getDefaultPath(); + if (defaultPath != "") { + m->mothurOutEndLine(); m->mothurOut("Current default directory saved by mothur: " + defaultPath); m->mothurOutEndLine(); + } + + + string temp = "./"; +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) +#else + temp = ".\\"; +#endif + temp = m->getFullPathName(temp); + m->mothurOutEndLine(); m->mothurOut("Current working directory: " + temp); m->mothurOutEndLine(); - return 0; + return 0; } catch(exception& e) {