added logfile feature

[mothur.git] / database.cpp

diff --git a/database.cpp b/database.cpp
index 852e2d294a3887c747fa8a95bb56f36151d2890e..5fc9b676f128dd0a1d6999918b4fcb42357c407e 100644 (file)
--- a/database.cpp
+++ b/database.cpp
@@ -18,8 +18,9 @@ Database::Database(string fastaFileName){             //      This assumes that the template dat
 
        ifstream fastaFile;
        openInputFile(fastaFileName, fastaFile);
-
-       cout << endl << "Reading in the " << fastaFileName << " template sequences...\t";       cout.flush();
+       
+       mothurOutEndLine();
+       mothurOut("Reading in the " + fastaFileName + " template sequences...\t");      cout.flush();
 
        //all of this is elsewhere already!
        numSeqs=count(istreambuf_iterator<char>(fastaFile),istreambuf_iterator<char>(), '>');   //      count the number of
@@ -48,26 +49,15 @@ Database::Database(string fastaFileName){           //      This assumes that the template dat
        fastaFile.close();
        //all of this is elsewhere already!
        
-       cout << "DONE." << endl;        cout.flush();
+       mothurOut("DONE.");
+       mothurOutEndLine();     cout.flush();
 
 }
 /**************************************************************************************************/
 
 Database::~Database(){                                                                                                         
-       try {
-               
-               //for (int i = 0; i < templateSequences.size(); i++) {  delete templateSequences[i];    }
-               templateSequences.clear();
 
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Database class Function ~Database. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the Database class function ~Database. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
+               templateSequences.clear();
 }
 
 /**************************************************************************************************/