X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=setlogfilecommand.cpp;h=41c8e743122399563b8367fda6a9d4a94f9bda86;hp=576a37c11a26a656d34a9af69972dc4c3a329233;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77 diff --git a/setlogfilecommand.cpp b/setlogfilecommand.cpp index 576a37c..41c8e74 100644 --- a/setlogfilecommand.cpp +++ b/setlogfilecommand.cpp @@ -13,10 +13,10 @@ //********************************************************************************************************************** vector SetLogFileCommand::setParameters(){ try { - CommandParameter pappend("append", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pappend); - CommandParameter pname("name", "String", "", "", "", "", "",false,true); parameters.push_back(pname); - CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir); - CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir); + CommandParameter pappend("append", "Boolean", "", "F", "", "", "","",false,false); parameters.push_back(pappend); + CommandParameter pname("name", "String", "", "", "", "", "","",false,true,true); parameters.push_back(pname); + CommandParameter pinputdir("inputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(pinputdir); + CommandParameter poutputdir("outputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(poutputdir); vector myArray; for (int i = 0; i < parameters.size(); i++) { myArray.push_back(parameters[i].name); } @@ -85,9 +85,14 @@ int SetLogFileCommand::execute(){ if (abort == true) { if (calledHelp) { return 0; } return 2; } - commandFactory = CommandFactory::getInstance(); - - commandFactory->setLogfileName(name, append); + commandFactory = CommandFactory::getInstance(); + + string directory = m->hasPath(name); + if (directory == "") { + commandFactory->setLogfileName(name, append); + }else if (m->dirCheck(directory)) { + commandFactory->setLogfileName(name, append); + } return 0; }