X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=inputdata.cpp;h=8e54ab787c683535dd132caf0881aab3399945b9;hp=bf783a35d5e06e12fa4fcf2c3ff58ba7d9618778;hb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;hpb=a218321731df14d231bbc08e79906f757cf1540d

diff --git a/inputdata.cpp b/inputdata.cpp
index bf783a3..8e54ab7 100644
--- a/inputdata.cpp
+++ b/inputdata.cpp
@@ -15,7 +15,7 @@
 /***********************************************************************/
 
 InputData::InputData(string fName, string f) : format(f){
-	
+	m = MothurOut::getInstance();
 	openInputFile(fName, fileHandle);
 	filename = fName;
 	
@@ -34,7 +34,7 @@ InputData::~InputData(){
 
 InputData::InputData(string fName, string orderFileName, string f) : format(f){
 	try {
-		
+		m = MothurOut::getInstance();
 		ifstream ofHandle;
 		openInputFile(orderFileName, ofHandle);
 		string name;
@@ -52,7 +52,7 @@ InputData::InputData(string fName, string orderFileName, string f) : format(f){
 		openInputFile(fName, fileHandle);
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "InputData");
+		m->errorOut(e, "InputData", "InputData");
 		exit(1);
 	}
 }
@@ -73,7 +73,7 @@ ListVector* InputData::getListVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getListVector");
+		m->errorOut(e, "InputData", "getListVector");
 		exit(1);
 	}
 }
@@ -111,7 +111,7 @@ ListVector* InputData::getListVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getListVector");
+		m->errorOut(e, "InputData", "getListVector");
 		exit(1);
 	}
 }
@@ -134,7 +134,7 @@ SharedListVector* InputData::getSharedListVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedListVector");
+		m->errorOut(e, "InputData", "getSharedListVector");
 		exit(1);
 	}
 }
@@ -172,7 +172,7 @@ SharedListVector* InputData::getSharedListVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedListVector");
+		m->errorOut(e, "InputData", "getSharedListVector");
 		exit(1);
 	}
 }
@@ -196,7 +196,7 @@ SharedOrderVector* InputData::getSharedOrderVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedOrderVector");
+		m->errorOut(e, "InputData", "getSharedOrderVector");
 		exit(1);
 	}
 }
@@ -235,7 +235,7 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedOrderVector");
+		m->errorOut(e, "InputData", "getSharedOrderVector");
 		exit(1);
 	}
 }
@@ -275,7 +275,7 @@ OrderVector* InputData::getOrderVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getOrderVector");
+		m->errorOut(e, "InputData", "getOrderVector");
 		exit(1);
 	}
 }
@@ -378,7 +378,7 @@ OrderVector* InputData::getOrderVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getOrderVector");
+		m->errorOut(e, "InputData", "getOrderVector");
 		exit(1);
 	}
 }
@@ -408,7 +408,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
 		
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedRAbundVectors");
+		m->errorOut(e, "InputData", "getSharedRAbundVectors");
 		exit(1);
 	}
 }
@@ -466,7 +466,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
 	
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSharedRAbundVectors");
+		m->errorOut(e, "InputData", "getSharedRAbundVectors");
 		exit(1);
 	}
 }
@@ -505,7 +505,7 @@ SAbundVector* InputData::getSAbundVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSAbundVector");
+		m->errorOut(e, "InputData", "getSAbundVector");
 		exit(1);
 	}
 }
@@ -607,7 +607,7 @@ SAbundVector* InputData::getSAbundVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getSAbundVector");
+		m->errorOut(e, "InputData", "getSAbundVector");
 		exit(1);
 	}
 }
@@ -644,7 +644,7 @@ RAbundVector* InputData::getRAbundVector(){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getRAbundVector");
+		m->errorOut(e, "InputData", "getRAbundVector");
 		exit(1);
 	}
 }
@@ -745,7 +745,7 @@ RAbundVector* InputData::getRAbundVector(string label){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "InputData", "getRAbundVector");
+		m->errorOut(e, "InputData", "getRAbundVector");
 		exit(1);
 	}
 }