X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=seqsummarycommand.cpp;h=27bb8d95190fb66ea03510cf266d2d53824d988c;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hp=e9002bd7c12781eb6fd2fdb284da2ea06e65c4fa;hpb=a54ba6143022dc7294f4fdc468fc10b627c64b0e;p=mothur.git diff --git a/seqsummarycommand.cpp b/seqsummarycommand.cpp index e9002bd..27bb8d9 100644 --- a/seqsummarycommand.cpp +++ b/seqsummarycommand.cpp @@ -203,7 +203,7 @@ int SeqSummaryCommand::execute(){ if (namefile != "") { nameMap = m->readNames(namefile); } else if (countfile != "") { CountTable ct; - ct.readTable(countfile); + ct.readTable(countfile, false); nameMap = ct.getNameMap(); } @@ -452,11 +452,15 @@ int SeqSummaryCommand::driverCreateSummary(vector& startPosition, vectorcontrol_pressed) { in.close(); outSummary.close(); return 1; } - + + if (m->debug) { m->mothurOut("[DEBUG]: count = " + toString(count) + "\n"); } + Sequence current(in); m->gobble(in); if (current.getName() != "") { + if (m->debug) { m->mothurOut("[DEBUG]: " + current.getName() + '\t' + toString(current.getNumBases()) + "\n"); } + int num = 1; if ((namefile != "") || (countfile != "")) { //make sure this sequence is in the namefile, else error @@ -480,6 +484,8 @@ int SeqSummaryCommand::driverCreateSummary(vector& startPosition, vectordebug) { m->mothurOut("[DEBUG]: " + current.getName() + '\t' + toString(current.getNumBases()) + "\n"); } } #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) @@ -488,13 +494,8 @@ int SeqSummaryCommand::driverCreateSummary(vector& startPosition, vectormothurOut(toString(count)); m->mothurOutEndLine(); } } - //report progress - //if((count) % 100 != 0){ m->mothurOut(toString(count)); m->mothurOutEndLine(); } - + in.close(); return count;