X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=otuhierarchycommand.cpp;h=e32e0b6c339c5b80108a3e874ce9c990ef5a2376;hb=5a4ac4f954c4b4445bcee272f1f8220ddcc9c1e4;hp=cc5703223c7db32f31a2bf6db21d256145100f06;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77;p=mothur.git

diff --git a/otuhierarchycommand.cpp b/otuhierarchycommand.cpp
index cc57032..e32e0b6 100644
--- a/otuhierarchycommand.cpp
+++ b/otuhierarchycommand.cpp
@@ -46,7 +46,26 @@ string OtuHierarchyCommand::getHelpString(){
 		exit(1);
 	}
 }
-
+//**********************************************************************************************************************
+string OtuHierarchyCommand::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 == "otuheirarchy") {  outputFileName =  "otu.hierarchy"; }
+            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, "OtuHierarchyCommand", "getOutputFileNameTag");
+		exit(1);
+	}
+}
 //**********************************************************************************************************************
 OtuHierarchyCommand::OtuHierarchyCommand(){	
 	try {
@@ -110,6 +129,7 @@ OtuHierarchyCommand::OtuHierarchyCommand(string option) {
 					abort = true;
 				}
 			}else if (listFile == "not open") { abort = true; }	
+			else { m->setListFile(listFile); }
 			
 			//if the user changes the output directory command factory will send this info to us in the output parameter 
 			outputDir = validParameter.validFile(parameters, "outputdir", false);		if (outputDir == "not found"){	
@@ -179,13 +199,13 @@ int OtuHierarchyCommand::execute(){
 		}
 		
 		ofstream out;
-		string outputFileName = outputDir + m->getRootName(m->getSimpleName(listFile)) + lists[0].getLabel() + "-" + lists[1].getLabel() + ".otu.hierarchy";
+		string outputFileName = outputDir + m->getRootName(m->getSimpleName(listFile)) + lists[0].getLabel() + "-" + lists[1].getLabel() + "." + getOutputFileNameTag("otuheirarchy");
 		m->openOutputFile(outputFileName, out);
 		
 		//go through each bin in "big" otu and output the bins in "little" otu which created it
 		for (int i = 0; i < lists[1].getNumBins(); i++) {
 		
-			if (m->control_pressed) { outputTypes.clear(); out.close(); remove(outputFileName.c_str()); return 0; }
+			if (m->control_pressed) { outputTypes.clear(); out.close(); m->mothurRemove(outputFileName); return 0; }
 			
 			string names = lists[1].get(i);
 			
@@ -218,7 +238,7 @@ int OtuHierarchyCommand::execute(){
 		
 		out.close();
 		
-		if (m->control_pressed) { outputTypes.clear(); remove(outputFileName.c_str()); return 0; }
+		if (m->control_pressed) { outputTypes.clear(); m->mothurRemove(outputFileName); return 0; }
 		
 		m->mothurOutEndLine();
 		m->mothurOut("Output File Name: "); m->mothurOutEndLine();