indicator command

[mothur.git] / inputdata.cpp

diff --git a/inputdata.cpp b/inputdata.cpp
index ec23955513f42c218ed750be5471eb23ee08cd40..ac215ca99438fce1b19416c93942d8c5ef51c6a3 100644 (file)
--- a/inputdata.cpp
+++ b/inputdata.cpp
@@ -20,12 +20,14 @@ InputData::InputData(string fName, string f) : format(f){
        filename = fName;
        m->saveNextLabel = "";
        
+       
 }
 /***********************************************************************/
 
 InputData::~InputData(){
        fileHandle.close();
        m->saveNextLabel = "";
+       
 }
 
 /***********************************************************************/
@@ -48,6 +50,7 @@ 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");
@@ -292,7 +295,7 @@ OrderVector* InputData::getOrderVector(){
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
                        }
-                       
+                                               
                        m->gobble(fileHandle);
                        
                        output = new OrderVector();     
@@ -394,7 +397,7 @@ OrderVector* InputData::getOrderVector(string label){
                                }
 
                        }
-                       
+                                               
                        in.close();             
 
                        output = new OrderVector();
@@ -622,8 +625,7 @@ SAbundVector* InputData::getSAbundVector(){
                        }
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
-                       }
-                                       
+                       }                                       
                        m->gobble(fileHandle);
 
                        sabund = new SAbundVector();
@@ -762,7 +764,7 @@ RAbundVector* InputData::getRAbundVector(){
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
                        }
-                                       
+                       
                        m->gobble(fileHandle);
 
                        rabund = new RAbundVector();
@@ -862,7 +864,8 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        
                                }
 
-                       }
+                       }                       
+                       
                        
                        in.close();