X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=inputdata.cpp;fp=inputdata.cpp;h=c9142b7a356de09f0fddd89ae5f415993f4795c3;hp=8b1829a3db697df21b3d0f64bf6be6cfea15c536;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=f6a58db15cdc7b90a601f8bf9c9d3b69d642f85d diff --git a/inputdata.cpp b/inputdata.cpp index 8b1829a..c9142b7 100644 --- a/inputdata.cpp +++ b/inputdata.cpp @@ -83,6 +83,7 @@ ListVector* InputData::getListVector(string label){ ifstream in; string thisLabel; m->openInputFile(filename, in); + m->saveNextLabel = ""; if(in){ @@ -119,6 +120,7 @@ ListVector* InputData::getListVector(string label, bool resetFP){ string thisLabel; fileHandle.clear(); fileHandle.seekg(0); + m->saveNextLabel = ""; if(fileHandle){ @@ -239,6 +241,7 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){ ifstream in; string thisLabel; m->openInputFile(filename, in); + m->saveNextLabel = ""; if(in){ @@ -321,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); @@ -335,7 +338,7 @@ OrderVector* InputData::getOrderVector(string label){ } } else if (format == "shared") { - + m->saveNextLabel = ""; while (in.eof() != true) { input = new SharedListVector(in); @@ -650,7 +653,7 @@ SAbundVector* InputData::getSAbundVector(string label){ if(in){ if (format == "list") { - + m->saveNextLabel = ""; while (in.eof() != true) { input = new ListVector(in); @@ -664,7 +667,7 @@ SAbundVector* InputData::getSAbundVector(string label){ } } else if (format == "shared") { - + m->saveNextLabel = ""; while (in.eof() != true) { input = new SharedListVector(in); @@ -789,6 +792,7 @@ RAbundVector* InputData::getRAbundVector(string label){ if(in){ if (format == "list") { + m->saveNextLabel = ""; while (in.eof() != true) { @@ -803,6 +807,7 @@ RAbundVector* InputData::getRAbundVector(string label){ } } else if (format == "shared") { + m->saveNextLabel = ""; while (in.eof() != true) {