X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getrelabundcommand.cpp;h=7c623fbfd8ced3cd88bff70b3579e893d6e6cfa0;hb=16f9c4ab6f39769856b13e048eae2c8eaa413c02;hp=26d795808e826e9f13279bc8dcbbcfe9fc7ba14a;hpb=19fcbbdba99658f5eca244803280f9ee7f9f6607;p=mothur.git

diff --git a/getrelabundcommand.cpp b/getrelabundcommand.cpp
index 26d7958..7c623fb 100644
--- a/getrelabundcommand.cpp
+++ b/getrelabundcommand.cpp
@@ -49,6 +49,26 @@ string GetRelAbundCommand::getHelpString(){
 	}
 }
 //**********************************************************************************************************************
+string GetRelAbundCommand::getOutputFileNameTag(string type, string inputName=""){	
+	try {
+        string outputFileName = "";
+		map<string, vector<string> >::iterator it;
+        
+        //is this a type this command creates
+        it = outputTypes.find(type);
+        if (it == outputTypes.end()) {  m->mothurOut("[ERROR]: this command doesn't create a " + type + " output file.\n"); }
+        else {
+            if (type == "relabund")         {   outputFileName = "relabund" ;  }
+            else { m->mothurOut("[ERROR]: No definition for type " + type + " output file tag.\n"); m->control_pressed = true;  }
+        }
+        return outputFileName;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "GetRelAbundCommand", "getOutputFileNameTag");
+		exit(1);
+	}
+}
+//**********************************************************************************************************************
 GetRelAbundCommand::GetRelAbundCommand(){	
 	try {
 		abort = true; calledHelp = true; 
@@ -131,7 +151,7 @@ GetRelAbundCommand::GetRelAbundCommand(string option) {
 			else { 
 				pickedGroups = true;
 				m->splitAtDash(groups, Groups);
-				m->Groups = Groups;
+				m->setGroups(Groups);
 			}
 			
 			scale = validParameter.validFile(parameters, "scale", false);				if (scale == "not found") { scale = "totalgroup"; }
@@ -154,7 +174,7 @@ int GetRelAbundCommand::execute(){
 	
 		if (abort == true) { if (calledHelp) { return 0; }  return 2;	}
 		
-		string outputFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + "relabund";
+		string outputFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + getOutputFileNameTag("relabund");
 		ofstream out;
 		m->openOutputFile(outputFileName, out);
 		out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
@@ -170,7 +190,7 @@ int GetRelAbundCommand::execute(){
 		//as long as you are not at the end of the file or done wih the lines you want
 		while((lookup[0] != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
 			
-			if (m->control_pressed) {  outputTypes.clear();  for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } m->Groups.clear(); delete input;  out.close(); m->mothurRemove(outputFileName); return 0; }
+			if (m->control_pressed) {  outputTypes.clear();  for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } m->clearGroups(); delete input;  out.close(); m->mothurRemove(outputFileName); return 0; }
 	
 			if(allLines == 1 || labels.count(lookup[0]->getLabel()) == 1){			
 
@@ -202,13 +222,13 @@ int GetRelAbundCommand::execute(){
 			//prevent memory leak
 			for (int i = 0; i < lookup.size(); i++) {  delete lookup[i]; lookup[i] = NULL; }
 			
-			if (m->control_pressed) {  outputTypes.clear();  m->Groups.clear(); delete input;  out.close(); m->mothurRemove(outputFileName); return 0; }
+			if (m->control_pressed) {  outputTypes.clear();  m->clearGroups(); delete input;  out.close(); m->mothurRemove(outputFileName); return 0; }
 
 			//get next line to process
 			lookup = input->getSharedRAbundVectors();				
 		}
 		
-		if (m->control_pressed) { outputTypes.clear(); m->Groups.clear(); delete input;  out.close(); m->mothurRemove(outputFileName);  return 0; }
+		if (m->control_pressed) { outputTypes.clear(); m->clearGroups(); delete input;  out.close(); m->mothurRemove(outputFileName);  return 0; }
 
 		//output error messages about any remaining user labels
 		set<string>::iterator it;
@@ -236,7 +256,7 @@ int GetRelAbundCommand::execute(){
 		}
 	
 		//reset groups parameter
-		m->Groups.clear();  
+		m->clearGroups();  
 		delete input; 
 		out.close();