X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimerabellerophoncommand.cpp;h=82400112bc8770ca2ded637853028d86e6aede99;hb=f320651dfb5359e6bba597280753553de28a2154;hp=c519f91ede4bafbf1802dc813d2679be4a792c17;hpb=4f3d46bdb42c23468a534486fd105180b030fc65;p=mothur.git

diff --git a/chimerabellerophoncommand.cpp b/chimerabellerophoncommand.cpp
index c519f91..8240011 100644
--- a/chimerabellerophoncommand.cpp
+++ b/chimerabellerophoncommand.cpp
@@ -57,6 +57,27 @@ string ChimeraBellerophonCommand::getHelpString(){
 	}
 }
 //**********************************************************************************************************************
+string ChimeraBellerophonCommand::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 == "chimera") {  outputFileName =  "bellerophon.chimeras"; }
+            else if (type == "accnos") {  outputFileName =  "bellerophon.accnos"; }
+            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, "ChimeraBellerophonCommand", "getOutputFileNameTag");
+		exit(1);
+	}
+}
+//**********************************************************************************************************************
 ChimeraBellerophonCommand::ChimeraBellerophonCommand(){	
 	try {
 		abort = true; calledHelp = true; 
@@ -222,8 +243,8 @@ int ChimeraBellerophonCommand::execute(){
 			chimera = new Bellerophon(fastaFileNames[i], filter, correction, window, increment, processors, outputDir);	
 			
 			if (outputDir == "") { outputDir = m->hasPath(fastaFileNames[i]);  }//if user entered a file with a path then preserve it		
-			string outputFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[i])) +  "bellerophon.chimeras";
-			string accnosFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[i])) + "bellerophon.accnos";
+			string outputFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[i])) +  getOutputFileNameTag("chimera");
+			string accnosFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[i])) +  getOutputFileNameTag("accnos");
 			
 			chimera->getChimeras();