X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=seqerrorcommand.cpp;h=5879241372dd3b60b34683683a0c1edbcbd64d57;hp=203a71ede5544a3d1c5e2eba73072fa825445aac;hb=615301e57c25e241356a9c2380648d117709458d;hpb=c48d91112209b841444923670dca5454da0e2a4d diff --git a/seqerrorcommand.cpp b/seqerrorcommand.cpp index 203a71e..5879241 100644 --- a/seqerrorcommand.cpp +++ b/seqerrorcommand.cpp @@ -358,7 +358,7 @@ int SeqErrorCommand::execute(){ if(namesFileName != "") { weights = getWeights(); } else if (countfile != "") { CountTable ct; - ct.readTable(countfile); + ct.readTable(countfile, false); weights = ct.getNameMap(); } @@ -1412,9 +1412,7 @@ int SeqErrorCommand::setLines(string filename, string qfilename, string rfilenam string sname = ""; nameStream >> sname; sname = sname.substr(1); - for (int i = 0; i < sname.length(); i++) { - if (sname[i] == ':') { sname[i] = '_'; m->changedSeqNames = true; } - } + m->checkName(sname); map::iterator it = firstSeqNames.find(sname); @@ -1475,9 +1473,7 @@ int SeqErrorCommand::setLines(string filename, string qfilename, string rfilenam istringstream nameStream(input); string sname = ""; nameStream >> sname; - for (int i = 0; i < sname.length(); i++) { - if (sname[i] == ':') { sname[i] = '_'; m->changedSeqNames = true; } - } + m->checkName(sname); map::iterator it = firstSeqNamesReport.find(sname);