X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=inputdata.cpp;h=c9142b7a356de09f0fddd89ae5f415993f4795c3;hb=f7184748e1519090deecfb6dd9fda118ffba2b53;hp=08bab60dbd71f4e4c4d0b56472ccb199a026d85b;hpb=10c8178dc5e3f96ef8e92a986f1eddd13e622173;p=mothur.git

diff --git a/inputdata.cpp b/inputdata.cpp
index 08bab60..c9142b7 100644
--- a/inputdata.cpp
+++ b/inputdata.cpp
@@ -19,7 +19,6 @@ InputData::InputData(string fName, string f) : format(f){
 	m->openInputFile(fName, fileHandle);
 	filename = fName;
 	m->saveNextLabel = "";
-	
 }
 /***********************************************************************/
 
@@ -48,6 +47,8 @@ InputData::InputData(string fName, string orderFileName, string f) : format(f){
 		ofHandle.close();
 	
 		m->openInputFile(fName, fileHandle);
+		m->saveNextLabel = "";
+		
 	}
 	catch(exception& e) {
 		m->errorOut(e, "InputData", "InputData");
@@ -82,6 +83,7 @@ ListVector* InputData::getListVector(string label){
 		ifstream in;
 		string  thisLabel;
 		m->openInputFile(filename, in);
+        m->saveNextLabel = "";
 		
 		if(in){
 
@@ -118,6 +120,7 @@ ListVector* InputData::getListVector(string label, bool resetFP){
 		string  thisLabel;
 		fileHandle.clear();
 		fileHandle.seekg(0);
+        m->saveNextLabel = "";
 		
 		if(fileHandle){
 
@@ -238,6 +241,7 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){
 		ifstream in;
 		string  thisLabel;
 		m->openInputFile(filename, in);
+        m->saveNextLabel = "";
 		
 		if(in){
 
@@ -320,7 +324,7 @@ OrderVector* InputData::getOrderVector(string label){
 		
 		if(in){
 			if((format == "list") || (format == "listorder")) {
-			
+                m->saveNextLabel = "";
 				while (in.eof() != true) {
 					
 					input = new ListVector(in);
@@ -334,7 +338,7 @@ OrderVector* InputData::getOrderVector(string label){
 				}
 			}
 			else if (format == "shared")  {
-				
+				m->saveNextLabel = "";
 				while (in.eof() != true) {
 					
 					input = new SharedListVector(in);
@@ -649,7 +653,7 @@ SAbundVector* InputData::getSAbundVector(string label){
 		
 		if(in){
 			if (format == "list") {
-			
+                m->saveNextLabel = "";
 				while (in.eof() != true) {
 					
 					input = new ListVector(in);
@@ -663,7 +667,7 @@ SAbundVector* InputData::getSAbundVector(string label){
 				}
 			}
 			else if (format == "shared")  {
-				
+				m->saveNextLabel = "";
 				while (in.eof() != true) {
 					
 					input = new SharedListVector(in);
@@ -788,6 +792,7 @@ RAbundVector* InputData::getRAbundVector(string label){
 		
 		if(in){
 			if (format == "list") {
+                m->saveNextLabel = "";
 			
 				while (in.eof() != true) {
 					
@@ -802,6 +807,7 @@ RAbundVector* InputData::getRAbundVector(string label){
 				}
 			}
 			else if (format == "shared")  {
+                m->saveNextLabel = "";
 				
 				while (in.eof() != true) {