From: westcott <westcott>
Date: Mon, 13 Dec 2010 13:55:30 +0000 (+0000)
Subject: classify.seqs summary file fix
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=2e77272b6f5987bd2bde592bb15262a8c69ea9e0

classify.seqs summary file fix
---

diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp
index 9030948..bbdf811 100644
--- a/classifyseqscommand.cpp
+++ b/classifyseqscommand.cpp
@@ -652,7 +652,7 @@ int ClassifySeqsCommand::execute(){
 			
 			//get maxLevel from phylotree so you know how many 'unclassified's to add
 			int maxLevel = taxaSum.getMaxLevel();
-			
+							
 			//read taxfile - this reading and rewriting is done to preserve the confidence scores.
 			string name, taxon;
 			while (!inTax.eof()) {
diff --git a/mothur b/mothur
index 3bd8d60..0812c5e 100755
Binary files a/mothur and b/mothur differ
diff --git a/phylosummary.cpp b/phylosummary.cpp
index 39bfdf3..4e94605 100644
--- a/phylosummary.cpp
+++ b/phylosummary.cpp
@@ -117,15 +117,15 @@ int PhyloSummary::addSeqToTree(string seqName, string seqTaxonomy){
 					if (group == "not found") {  m->mothurOut(seqName + " is not in your groupfile, and will be included in the overall total, but not any group total."); m->mothurOutEndLine();  }
 					
 					//do you have a count for this group?
-					map<string, int>::iterator itGroup = tree[currentNode].groupCount.find(group);
+					map<string, int>::iterator itGroup = tree[childPointer->second].groupCount.find(group);
 					
 					//if yes, increment it - there should not be a case where we can't find it since we load group in read
-					if (itGroup != tree[currentNode].groupCount.end()) {
-						tree[currentNode].groupCount[group]++;
+					if (itGroup != tree[childPointer->second].groupCount.end()) {
+						tree[childPointer->second].groupCount[group]++;
 					}
 				}
 				
-				tree[currentNode].total++;
+				tree[childPointer->second].total++;
 
 				currentNode = childPointer->second;
 			}else{	//otherwise, error