X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getoturepcommand.cpp;h=a73fdf67bd24baf00d8cda5d3bb1f54ff708bc08;hb=1f78a8c454a636f19b4711bd52782ea1e3e81d3d;hp=91990811173cea55be293e643647ff8a1352db77;hpb=8ab46c171b45ae3782d839539792d049017a361b;p=mothur.git diff --git a/getoturepcommand.cpp b/getoturepcommand.cpp index 9199081..a73fdf6 100644 --- a/getoturepcommand.cpp +++ b/getoturepcommand.cpp @@ -324,7 +324,7 @@ int GetOTURepCommand::execute(){ //set format to list so input can get listvector globaldata->setFormat("list"); - + //read list file read = new ReadOTUFile(listfile); read->read(&*globaldata); @@ -332,7 +332,7 @@ int GetOTURepCommand::execute(){ input = globaldata->ginput; list = globaldata->gListVector; string lastLabel = list->getLabel(); - + //if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label. set processedLabels; set userLabels = labels; @@ -382,7 +382,7 @@ int GetOTURepCommand::execute(){ } lastLabel = list->getLabel(); - + delete list; list = input->getListVector(); } @@ -390,8 +390,8 @@ int GetOTURepCommand::execute(){ //output error messages about any remaining user labels bool needToRun = false; for (set::iterator it = userLabels.begin(); it != userLabels.end(); it++) { - m->mothurOut("Your file does not include the label " + *it); - if (processedLabels.count(list->getLabel()) != 1) { + m->mothurOut("Your file does not include the label " + (*it)); + if (processedLabels.count(lastLabel) != 1) { m->mothurOut(". I will use " + lastLabel + "."); m->mothurOutEndLine(); needToRun = true; }else {