]> git.donarmstrong.com Git - mothur.git/blobdiff - readotucommand.cpp
version working on mac with .tellg changed to unget for windows
[mothur.git] / readotucommand.cpp
index ba7eae42a668e7fa9bf3a9f8d33c4746b55ce810..50ee5c103c00a144159b52a8c1779b7627e46079 100644 (file)
@@ -64,6 +64,7 @@ ReadOtuCommand::ReadOtuCommand(string option){
                                globaldata->setGroupFile(groupfile); 
                                groupMap = new GroupMap(groupfile);
                                groupMap->readMap();
+                               globaldata->gGroupmap = groupMap;
                        }
 
                        //you are doing a list and group shared
@@ -106,7 +107,6 @@ ReadOtuCommand::ReadOtuCommand(string option){
                        if (abort == false) {
                                //gets whichever one of the above is set
                                filename = globaldata->inputFileName;
-                               //read = new ReadOTUFile(filename);
                        }
 
                }
@@ -155,9 +155,7 @@ void ReadOtuCommand::help(){
 //**********************************************************************************************************************
 
 ReadOtuCommand::~ReadOtuCommand(){
-       if (abort == false) {  //delete read; 
-        }
-}
+       }
 
 //**********************************************************************************************************************
 
@@ -166,12 +164,7 @@ int ReadOtuCommand::execute(){
        
                if (abort == true) {    return 0;       }
                
-               //read->read(&*globaldata); 
                if (globaldata->getFormat() == "shared") {
-                       groupMap->readMap();
-                       
-                       //if (globaldata->gGroupmap != NULL) { delete globaldata->gGroupmap;  }
-                       globaldata->gGroupmap = groupMap;
                        
                        parselist = new ParseListCommand();
                        parselist->execute();