X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=consensusseqscommand.cpp;h=d9a5e294c08d1cd3a68c7890b7c0a6ab7fbde04a;hb=6b32d112bb60e9f7eb6d4407a4eed4c49b67bced;hp=1b1e7d20d37603610945f6dadbf6dd32399ed8d5;hpb=8d341208b0cd0c7a4ff8b77c6b164e06f2f39610;p=mothur.git

diff --git a/consensusseqscommand.cpp b/consensusseqscommand.cpp
index 1b1e7d2..d9a5e29 100644
--- a/consensusseqscommand.cpp
+++ b/consensusseqscommand.cpp
@@ -226,7 +226,7 @@ int ConsensusSeqsCommand::execute(){
 		if (m->control_pressed) { return 0; }
 		
 		if (namefile != "") { readNames(); }
-        if (countfile != "") { ct.readTable(countfile);  }
+        if (countfile != "") { ct.readTable(countfile, true, false);  }
 		
 		if (m->control_pressed) { return 0; }
 		
@@ -436,23 +436,16 @@ int ConsensusSeqsCommand::processList(ListVector*& list){
 		outSummary << "OTU#\tPositioninAlignment\tA\tT\tG\tC\tGap\tNumberofSeqs\tConsensusBase" << endl;
 		
         string snumBins = toString(list->getNumBins());
+        vector<string> binLabels = list->getLabels();
 		for (int i = 0; i < list->getNumBins(); i++) {
 			
 			if (m->control_pressed) { outSummary.close(); outName.close(); outFasta.close(); return 0; }
 			
 			string bin = list->get(i);
 			string consSeq = getConsSeq(bin, outSummary, i);
-            
-            string seqName = "Otu";
-            string sbinNumber = toString(i+1);
-            if (sbinNumber.length() < snumBins.length()) {
-                int diff = snumBins.length() - sbinNumber.length();
-                for (int h = 0; h < diff; h++) { seqName += "0"; }
-            }
-            seqName += sbinNumber;
 			
-			outFasta << ">" << seqName << endl << consSeq << endl;
-			outName << seqName << '\t' << seqName << "," << bin << endl;
+			outFasta << ">" << binLabels[i] << endl << consSeq << endl;
+			outName << binLabels[i] << '\t' << binLabels[i] << "," << bin << endl;
 		}
 		
 		outSummary.close(); outName.close(); outFasta.close();