X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readotu.cpp;h=00448f8a24cced84a346dfedc434ffa838698371;hb=dd173a49e37f6bae73a63c32dd7c98d317bb4a79;hp=84132ae5bdecda6f1e967dffdbeb284cfd281f23;hpb=4ba6188707e67c638ea5ee3c787d5d07ccd07e3e;p=mothur.git diff --git a/readotu.cpp b/readotu.cpp index 84132ae..00448f8 100644 --- a/readotu.cpp +++ b/readotu.cpp @@ -12,8 +12,8 @@ /***********************************************************************/ ReadOTUFile::ReadOTUFile(string pf): philFile(pf){ - - //openInputFile(philFile, fileHandle); + m = MothurOut::getInstance(); + //m->openInputFile(philFile, fileHandle); } /***********************************************************************/ @@ -35,7 +35,7 @@ void ReadOTUFile::read(GlobalData* globaldata){ //memory leak prevention //if (globaldata->ginput != NULL) { delete globaldata->ginput; } globaldata->ginput = input; //saving to be used by collector and rarefact commands. - + if ((globaldata->getFormat() == "list") || (globaldata->getFormat() == "rabund") || (globaldata->getFormat() == "sabund")) {//you are reading a list, rabund or sabund file for collect, rarefaction or summary. //cout << input << '\t' << globaldata << endl; @@ -70,7 +70,7 @@ void ReadOTUFile::read(GlobalData* globaldata){ } } catch(exception& e) { - errorOut(e, "ReadOTUFile", "read"); + m->errorOut(e, "ReadOTUFile", "read"); exit(1); } }