added load.logfile command. changed summary.single output for subsample=t.

[mothur.git] / homovacommand.cpp

diff --git a/homovacommand.cpp b/homovacommand.cpp
index 9b7ec9fb030becda2b3df217afedcdd40facd4cc..006f1e4d5ee0b046e3216b0f470ce5d5c6200aa0 100644 (file)
--- a/homovacommand.cpp
+++ b/homovacommand.cpp
@@ -49,9 +49,27 @@ string HomovaCommand::getHelpString(){
                exit(1);
        }
 }
-
 //**********************************************************************************************************************
-
+string HomovaCommand::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 == "homova")            {   outputFileName =  "homova";   }
+            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, "HomovaCommand", "getOutputFileNameTag");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
 HomovaCommand::HomovaCommand(){        
        try {
                abort = true; calledHelp = true; 
@@ -190,7 +208,7 @@ int HomovaCommand::execute(){
                
                //create a new filename
                ofstream HOMOVAFile;
-               string HOMOVAFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName))  + "homova";                               
+               string HOMOVAFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName)) + getOutputFileNameTag("homova");                          
                m->openOutputFile(HOMOVAFileName, HOMOVAFile);
                outputNames.push_back(HOMOVAFileName); outputTypes["homova"].push_back(HOMOVAFileName);