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

[mothur.git] / createdatabasecommand.cpp

diff --git a/createdatabasecommand.cpp b/createdatabasecommand.cpp
index 57d5264b8b151d4175b6754ab2ee75732e1e597e..febd762592acdca2df39b7d8d076f0020dfa444d 100644 (file)
--- a/createdatabasecommand.cpp
+++ b/createdatabasecommand.cpp
@@ -53,6 +53,27 @@ string CreateDatabaseCommand::getHelpString(){
                exit(1);
        }
 }
+//**********************************************************************************************************************
+string CreateDatabaseCommand::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 == "database") {  outputFileName =  "database"; }
+            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, "CreateDatabaseCommand", "getOutputFileNameTag");
+               exit(1);
+       }
+}
+
 //**********************************************************************************************************************
 CreateDatabaseCommand::CreateDatabaseCommand(){        
        try {
@@ -244,7 +265,7 @@ int CreateDatabaseCommand::execute(){
         if (m->control_pressed) { delete list; if (groupfile != "") { delete groupmap; } return 0; }
         
         if (outputDir == "") { outputDir += m->hasPath(listfile); }
-        string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + "database";
+        string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + getOutputFileNameTag("database");
         outputNames.push_back(outputFileName); outputTypes["database"].push_back(outputFileName);
         
         ofstream out;