X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=otuhierarchycommand.cpp;fp=otuhierarchycommand.cpp;h=a294a77c69a8cd5582a38cf7394c510a1e5ccccb;hb=68d53ac6682978c5a023c1a3a4e5df6f8302d9fa;hp=dc026decc9db9916513fcbd1d41fe23298173717;hpb=03fae12080951ea1d889da5187386abc236cc334;p=mothur.git

diff --git a/otuhierarchycommand.cpp b/otuhierarchycommand.cpp
index dc026de..a294a77 100644
--- a/otuhierarchycommand.cpp
+++ b/otuhierarchycommand.cpp
@@ -180,18 +180,10 @@ int OtuHierarchyCommand::execute(){
 		
 			if (m->control_pressed) {  return 0; }
 			
-			string names = lists[0].get(i); 
-			
-			//parse bin
-			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());
-				littleBins[name] = i;  
-			}
-			
-			//get last name
-			littleBins[names] = i;
-		}
+			string bin = lists[0].get(i);
+            vector<string> names; m->splitAtComma(bin, names);
+			for (int j = 0; j < names.size(); j++) { littleBins[names[j]] = i; }
+        }
 		
 		ofstream out;
         map<string, string> variables; 
@@ -207,24 +199,19 @@ int OtuHierarchyCommand::execute(){
 		
 			if (m->control_pressed) { outputTypes.clear(); out.close(); m->mothurRemove(outputFileName); return 0; }
 			
-			string names = lists[1].get(i);
+			string binnames = lists[1].get(i);
+            vector<string> names; m->splitAtComma(binnames, names);
+            
 			
 			//output column 1
-			if (output == "name")	{   out << names << '\t';	}
-			else					{	out << i << '\t';		}
+			if (output == "name")	{   out << binnames << '\t';	}
+			else					{	out << (i+1) << '\t';		}
 			
 			map<int, int> bins; //bin numbers in little that are in this bin in big
 			map<int, int>::iterator it;
 			
 			//parse bin
-			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());
-				bins[littleBins[name]] = littleBins[name];  
-			}
-			
-			//get last name
-			bins[littleBins[names]] = littleBins[names]; 
+			for (int j = 0; j < names.size(); j++) { bins[littleBins[names[j]]] = littleBins[names[j]];   }
 			
 			string col2 = "";
 			for (it = bins.begin(); it != bins.end(); it++) {