X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=degapseqscommand.cpp;h=8687194778d2da8360b3367c3c5ec2bb00108431;hp=318a05ec0bee7765f835cce4301d2b7a97d16978;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96

diff --git a/degapseqscommand.cpp b/degapseqscommand.cpp
index 318a05e..8687194 100644
--- a/degapseqscommand.cpp
+++ b/degapseqscommand.cpp
@@ -13,9 +13,9 @@
 //**********************************************************************************************************************
 vector<string> DegapSeqsCommand::setParameters(){	
 	try {
-		CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pfasta);
-		CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir);
-		CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir);
+		CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "none", "none","fasta",false,true,true); parameters.push_back(pfasta);
+		CommandParameter pinputdir("inputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(pinputdir);
+		CommandParameter poutputdir("outputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(poutputdir);
 		
 		vector<string> myArray;
 		for (int i = 0; i < parameters.size(); i++) {	myArray.push_back(parameters[i].name);		}
@@ -46,24 +46,19 @@ string DegapSeqsCommand::getHelpString(){
 	}
 }
 //**********************************************************************************************************************
-string DegapSeqsCommand::getOutputFileNameTag(string type, string inputName=""){	
-	try {
-        string outputFileName = "";
-		map<string, vector<string> >::iterator it;
+string DegapSeqsCommand::getOutputPattern(string type) {
+    try {
+        string pattern = "";
         
-        //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 =  "ng.fasta"; }
-            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, "DegapSeqsCommand", "getOutputFileNameTag");
-		exit(1);
-	}
+        if (type == "fasta") {  pattern = "[filename],ng.fasta"; } 
+        else { m->mothurOut("[ERROR]: No definition for type " + type + " output pattern.\n"); m->control_pressed = true;  }
+        
+        return pattern;
+    }
+    catch(exception& e) {
+        m->errorOut(e, "DegapSeqsCommand", "getOutputPattern");
+        exit(1);
+    }
 }
 //**********************************************************************************************************************
 DegapSeqsCommand::DegapSeqsCommand(){	
@@ -213,7 +208,9 @@ int DegapSeqsCommand::execute(){
 			ofstream outFASTA;
 			string tempOutputDir = outputDir;
 			if (outputDir == "") { tempOutputDir = m->hasPath(fastaFileNames[s]); }
-			string degapFile = tempOutputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + getOutputFileNameTag("fasta");
+            map<string, string> variables; 
+            variables["[filename]"] = tempOutputDir + m->getRootName(m->getSimpleName(fastaFileNames[s]));
+			string degapFile = getOutputFileName("fasta", variables);
 			m->openOutputFile(degapFile, outFASTA);
 			
 			while(!inFASTA.eof()){
@@ -241,7 +238,7 @@ int DegapSeqsCommand::execute(){
 		}
 		
 		m->mothurOutEndLine();
-		m->mothurOut("Output File Name: "); m->mothurOutEndLine();
+		m->mothurOut("Output File Names: "); m->mothurOutEndLine();
 		for (int i = 0; i < outputNames.size(); i++) {	m->mothurOut(outputNames[i]); m->mothurOutEndLine();	}	
 		m->mothurOutEndLine();