X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=removeseqscommand.cpp;fp=removeseqscommand.cpp;h=2abe9ef78a8c76354d377087fa7a23deb27b4d25;hb=16abd6271c455bd01b34ff89a2e3641bef0fa128;hp=59c9b348ba1af9b719f35ae12a249265c7fe9662;hpb=896a4f281982a3c2889f6ce6d73be997072aceae;p=mothur.git diff --git a/removeseqscommand.cpp b/removeseqscommand.cpp index 59c9b34..2abe9ef 100644 --- a/removeseqscommand.cpp +++ b/removeseqscommand.cpp @@ -194,12 +194,12 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option) { }else { m->setAccnosFile(accnosfile); } fastafile = validParameter.validFile(parameters, "fasta", true); - if (fastafile == "not open") { abort = true; } + if (fastafile == "not open") { fastafile = ""; abort = true; } else if (fastafile == "not found") { fastafile = ""; } else { m->setFastaFile(fastafile); } namefile = validParameter.validFile(parameters, "name", true); - if (namefile == "not open") { abort = true; } + if (namefile == "not open") { namefile = ""; abort = true; } else if (namefile == "not found") { namefile = ""; } else { m->setNameFile(namefile); } @@ -237,6 +237,10 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option) { if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "") && (taxfile == "") && (qualfile == "")) { m->mothurOut("You must provide at least one of the following: fasta, name, group, taxonomy, quality, alignreport or list."); m->mothurOutEndLine(); abort = true; } + if ((fastafile != "") && (namefile == "")) { + vector files; files.push_back(fastafile); + parser.getNameFile(files); + } } }