X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readphylip.cpp;fp=readphylip.cpp;h=fe278ab14856f085a9a61bfc09e40522dcf96d03;hb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;hp=a1063e94d3d94f241f172bfe33a39ae54d5da7cb;hpb=37e0d78135e32b5aa58ca163f4d416716c78b67f;p=mothur.git

diff --git a/readphylip.cpp b/readphylip.cpp
index a1063e9..fe278ab 100644
--- a/readphylip.cpp
+++ b/readphylip.cpp
@@ -38,7 +38,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
                         }
                         else{
                                 list = new ListVector(nameMap->getListVector());
-                                if(nameMap->count(name)==0){        cout << "Error: Sequence '" << name << "' was not found in the names file, please correct" << endl; }
+                                if(nameMap->count(name)==0){        mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); }
                         }
         
                         char d;
@@ -89,7 +89,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
                                 
                                         }
                                         else{
-                                                if(nameMap->count(name)==0){        cout << "Error: Sequence '" << name << "' was not found in the names file, please correct" << endl; }
+                                                if(nameMap->count(name)==0){        mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); }
                                 
                                                 for(int j=0;j<i;j++){
                                                         fileHandle >> distance;
@@ -133,7 +133,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
                                         
                                         }
                                         else{
-                                                if(nameMap->count(name)==0){        cout << "Error: Sequence '" << name << "' was not found in the names file, please correct" << endl; }
+                                                if(nameMap->count(name)==0){        mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); }
                                 
                                                 for(int j=0;j<nseqs;j++){
                                                         fileHandle >> distance;
@@ -162,20 +162,16 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
                                 }
                                 if(nameMap->size() > 0){
                                         //should probably tell them what is missing if we missed something
-                                        cout << "missed something" << '\t' << nameMap->size() << endl;
+                                        mothurOut("missed something\t" + toString(nameMap->size())); mothurOutEndLine();
                                 }
                         }
 
                 }
         catch(exception& e) {
-                cout << "Standard Error: " << e.what() << " has occurred in the ReadPhylipMatrix class Function read. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "ReadPhylipMatrix", "read");
                 exit(1);
         }
-        catch(...) {
-                cout << "An unknown error has occurred in the ReadPhylipMatrix class function read. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-                exit(1);
-        }
-}
+	}
 
 /***********************************************************************/