X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=setlogfilecommand.cpp;h=128c5671ed55712d2293e0b3c3959da17a7e9f05;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=0a3dfc974f1d6ca45352b712efea37a2df02daf0;hpb=1d898dc6edaf9e9f287fab53bf1f21fb29757a17;p=mothur.git diff --git a/setlogfilecommand.cpp b/setlogfilecommand.cpp index 0a3dfc9..128c567 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); } @@ -51,11 +51,10 @@ SetLogFileCommand::SetLogFileCommand(string option) { //allow user to run help if(option == "help") { help(); abort = true; calledHelp = true; } + else if(option == "citation") { citation(); abort = true; calledHelp = true;} else { - //valid paramters for this command - string Array[] = {"name","append","outputdir","inputdir"}; - vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + vector myArray = setParameters(); OptionParser parser(option); map parameters = parser.getParameters();