X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clusterfragmentscommand.cpp;h=4a338419af8900f8b7ebd693225a7e9f4d193481;hb=ccae9eef0b44f2d63fdf4a707d0d40243aa1b990;hp=772113baf83e9fbbd057794103f46ffa21c21fda;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc;p=mothur.git

diff --git a/clusterfragmentscommand.cpp b/clusterfragmentscommand.cpp
index 772113b..4a33841 100644
--- a/clusterfragmentscommand.cpp
+++ b/clusterfragmentscommand.cpp
@@ -66,6 +66,28 @@ string ClusterFragmentsCommand::getHelpString(){
 		exit(1);
 	}
 }
+//**********************************************************************************************************************
+string ClusterFragmentsCommand::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 == "fasta") {  outputFileName =  "fragclust.fasta"; }
+            else if (type == "name") {  outputFileName =  "fragclust.names"; }
+            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, "ClusterFragmentsCommand", "getOutputFileNameTag");
+		exit(1);
+	}
+}
+
 //**********************************************************************************************************************
 ClusterFragmentsCommand::ClusterFragmentsCommand(){	
 	try {
@@ -230,8 +252,8 @@ int ClusterFragmentsCommand::execute(){
 		
 		string fileroot = outputDir + m->getRootName(m->getSimpleName(fastafile));
 		
-		string newFastaFile = fileroot + "fragclust.fasta";
-		string newNamesFile = fileroot + "fragclust.names";
+		string newFastaFile = fileroot + getOutputFileNameTag("fasta");
+		string newNamesFile = fileroot + getOutputFileNameTag("name");
 		
 		if (m->control_pressed) { return 0; }