X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getsharedotucommand.cpp;h=1b69a25d4af7e638dbf48a64baec2390f37dcfec;hb=529ec122f7cac4af987e121d150b878d7c7a0d5d;hp=9beca6aa96f75a58891b5326b5cbd94209701656;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git diff --git a/getsharedotucommand.cpp b/getsharedotucommand.cpp index 9beca6a..1b69a25 100644 --- a/getsharedotucommand.cpp +++ b/getsharedotucommand.cpp @@ -417,10 +417,11 @@ int GetSharedOTUCommand::process(ListVector* shared) { vector namesOfSeqsInThisBin; - string names = shared->get(i); - while ((names.find_first_of(',') != -1)) { - string name = names.substr(0,names.find_first_of(',')); - names = names.substr(names.find_first_of(',')+1, names.length()); + string names = shared->get(i); + vector binNames; + m->splitAtComma(names, binNames); + for(int j = 0; j < binNames.size(); j++) { + string name = binNames[j]; //find group string seqGroup = groupMap->getGroup(name); @@ -436,20 +437,6 @@ int GetSharedOTUCommand::process(ListVector* shared) { else { atLeastOne[seqGroup]++; } } - //get last name - string seqGroup = groupMap->getGroup(names); - if (output != "accnos") { - namesOfSeqsInThisBin.push_back((names + "|" + seqGroup + "|" + toString(i+1))); - }else { namesOfSeqsInThisBin.push_back(names); } - - if (seqGroup == "not found") { m->mothurOut(names + " is not in your groupfile. Please correct."); m->mothurOutEndLine(); exit(1); } - - //is this seq in one of hte groups we care about - it = groupFinder.find(seqGroup); - if (it == groupFinder.end()) { uniqueOTU = false; } //you have a sequence from a group you don't want - else { atLeastOne[seqGroup]++; } - - //make sure you have at least one seq from each group you want bool sharedByAll = true; map::iterator it2;