version working on mac with .tellg changed to unget for windows

[mothur.git] / inputdata.cpp

diff --git a/inputdata.cpp b/inputdata.cpp
index 2c249e6a4a42b89a93b48a4252c60613f40fae9f..b4373c9ea057636634929f4b8e1e3d63398fdeec 100644 (file)
--- a/inputdata.cpp
+++ b/inputdata.cpp
@@ -24,7 +24,7 @@ InputData::InputData(string fName, string f) : format(f){
 
 
 InputData::~InputData(){
-       
+       fileHandle.close();
 //     delete output;
        
 }
@@ -72,7 +72,7 @@ ListVector* InputData::getListVector(){
                        return list;
                }
                else{
-                       return 0;
+                       return NULL;
                }
        }
        catch(exception& e) {
@@ -98,7 +98,7 @@ SharedListVector* InputData::getSharedListVector(){
                        return SharedList;
                }
                else{
-                       return 0;
+                       return NULL;
                }
        }
        catch(exception& e) {
@@ -124,7 +124,7 @@ SharedOrderVector* InputData::getSharedOrderVector(){
                        return SharedOrder;
                        
                }else{
-                       return 0;
+                       return NULL;
                }
        }
        catch(exception& e) {
@@ -170,7 +170,7 @@ OrderVector* InputData::getOrderVector(){
                        return output;
                }
                else{
-                       return 0;
+                       return NULL;
                }
        }
        catch(exception& e) {
@@ -183,14 +183,14 @@ OrderVector* InputData::getOrderVector(){
        }       
 }
 /***********************************************************************/
-
+//this is used when you don't need the order vector
 vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
        try {
                if(fileHandle){
                        if (format == "sharedfile")  {
-                               SharedOrder = new SharedOrderVector(fileHandle);
-                               if (SharedOrder != NULL) {
-                                       return SharedOrder->getSharedRAbundVector();
+                               SharedRAbundVector* SharedRAbund = new SharedRAbundVector(fileHandle);
+                               if (SharedRAbund != NULL) {
+                                       return SharedRAbund->getSharedRAbundVectors();
                                }
                        }else if (format == "shared") {
                                SharedList = new SharedListVector(fileHandle);
@@ -216,6 +216,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
        }       
 }
 
+
 /***********************************************************************/
 
 SAbundVector* InputData::getSAbundVector(){
@@ -245,7 +246,7 @@ SAbundVector* InputData::getSAbundVector(){
                        return sabund;
                }
                else{
-                       return 0;
+                       return NULL;
                }
        }
        catch(exception& e) {