X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getsharedotucommand.cpp;h=9beca6aa96f75a58891b5326b5cbd94209701656;hb=957d67f7d8bbadfd2930de061e89fd9b149270fd;hp=2312649d1cff739956638ba2ad8788949669f1d5;hpb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;p=mothur.git

diff --git a/getsharedotucommand.cpp b/getsharedotucommand.cpp
index 2312649..9beca6a 100644
--- a/getsharedotucommand.cpp
+++ b/getsharedotucommand.cpp
@@ -46,8 +46,8 @@ string GetSharedOTUCommand::getHelpString(){
 		helpString += "The output parameter allows you to output the list of names without the group and bin number added. \n";
 		helpString += "With this option you can use the names file as an input in get.seqs and remove.seqs commands. To do this enter output=accnos. \n";
 		helpString += "The get.sharedseqs command outputs a .names file for each distance level containing a list of sequences in the OTUs shared by the groups specified.\n";
-		helpString += "The get.sharedseqs command should be in the following format: get.sharedseqs(label=yourLabels, groups=yourGroups, fasta=yourFastafile, output=yourOutput).\n";
-		helpString += "Example get.sharedseqs(list=amazon.fn.list, label=unique-0.01, group=forest-pasture, fasta=amazon.fasta, output=accnos).\n";
+		helpString += "The get.sharedseqs command should be in the following format: get.sharedseqs(list=yourListFile, group=yourGroupFile, label=yourLabels, unique=yourGroups, fasta=yourFastafile, output=yourOutput).\n";
+		helpString += "Example get.sharedseqs(list=amazon.fn.list, label=unique-0.01, group= amazon.groups, unique=forest-pasture, fasta=amazon.fasta, output=accnos).\n";
 		helpString += "The output to the screen is the distance and the number of otus at that distance for the groups you specified.\n";
 		helpString += "The default value for label is all labels in your inputfile. The default for groups is all groups in your file.\n";
 		helpString += "Note: No spaces between parameter labels (i.e. label), '=' and parameters (i.e.yourLabel).\n";
@@ -58,6 +58,29 @@ string GetSharedOTUCommand::getHelpString(){
 		exit(1);
 	}
 }
+//**********************************************************************************************************************
+string GetSharedOTUCommand::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 =  "shared.fasta";   }
+            else if (type == "accnos")      {   outputFileName =  "accnos";         }
+            else if (type == "sharedseqs")  {   outputFileName =  "shared.seqs";    }
+            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, "GetSharedOTUCommand", "getOutputFileNameTag");
+		exit(1);
+	}
+}
+
 //**********************************************************************************************************************
 GetSharedOTUCommand::GetSharedOTUCommand(){	
 	try {
@@ -372,9 +395,9 @@ int GetSharedOTUCommand::process(ListVector* shared) {
 		
 		if (outputDir == "") { outputDir += m->hasPath(listfile); }
 		if (output != "accnos") {
-			outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + ".shared.seqs";
+			outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + "." + getOutputFileNameTag("sharedseqs");
 		}else {
-			outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + ".accnos";
+			outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + "." + getOutputFileNameTag("accnos");
 		}
 		m->openOutputFile(outputFileNames, outNames);
 		
@@ -481,7 +504,7 @@ int GetSharedOTUCommand::process(ListVector* shared) {
 		//if fasta file provided output new fasta file
 		if ((fastafile != "") && wroteSomething) {
 			if (outputDir == "") { outputDir += m->hasPath(fastafile); }
-			string outputFileFasta = outputDir + m->getRootName(m->getSimpleName(fastafile)) + shared->getLabel() + userGroups + ".shared.fasta";
+			string outputFileFasta = outputDir + m->getRootName(m->getSimpleName(fastafile)) + shared->getLabel() + userGroups + "." + getOutputFileNameTag("fasta");
 			ofstream outFasta;
 			m->openOutputFile(outputFileFasta, outFasta);
 			outputNames.push_back(outputFileFasta); outputTypes["fasta"].push_back(outputFileFasta);