X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mergefilecommand.cpp;h=2b34a00b8c3961d581032dcf6b6929404428a3b4;hb=4169642e8a8d45f71a4a7241ee02f1b1aae29520;hp=fcf63895b960fa8293df03dcff7c1e5bce28c914;hpb=92f998cc7debc4bf3e8594848586b8153d96db16;p=mothur.git

diff --git a/mergefilecommand.cpp b/mergefilecommand.cpp
index fcf6389..2b34a00 100644
--- a/mergefilecommand.cpp
+++ b/mergefilecommand.cpp
@@ -9,19 +9,66 @@
 
 #include "mergefilecommand.h"
 
+//**********************************************************************************************************************
+vector<string> MergeFileCommand::getValidParameters(){	
+	try {
+		string Array[] =  {"input", "output","outputdir","inputdir"};
+		vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+		return myArray;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "MergeFileCommand", "getValidParameters");
+		exit(1);
+	}
+}
+//**********************************************************************************************************************
+MergeFileCommand::MergeFileCommand(){	
+	try {
+		abort = true; calledHelp = true; 
+		vector<string> tempOutNames;
+		outputTypes["merge"] = tempOutNames;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "MergeFileCommand", "MergeFileCommand");
+		exit(1);
+	}
+}
+//**********************************************************************************************************************
+vector<string> MergeFileCommand::getRequiredParameters(){	
+	try {
+		string Array[] =  {"input","output"};
+		vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+		return myArray;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "MergeFileCommand", "getRequiredParameters");
+		exit(1);
+	}
+}
+//**********************************************************************************************************************
+vector<string> MergeFileCommand::getRequiredFiles(){	
+	try {
+		vector<string> myArray;
+		return myArray;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "MergeFileCommand", "getRequiredFiles");
+		exit(1);
+	}
+}
 //**********************************************************************************************************************
 
-MergeFileCommand::MergeFileCommand(string option){
+MergeFileCommand::MergeFileCommand(string option)  {
 	try {
-		abort = false;
+		abort = false; calledHelp = false;   
 		
 		if(option == "help") {
 			help();
-			abort = true; 
+			abort = true; calledHelp = true;
 		}
 		else {
 			//valid paramters for this command
-			string Array[] =  {"input", "output"};
+			string Array[] =  {"input", "output","outputdir","inputdir"};
 			vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
 			
 			OptionParser parser(option);
@@ -34,30 +81,49 @@ MergeFileCommand::MergeFileCommand(string option){
 				if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
 			}
 			
+			//initialize outputTypes
+			vector<string> tempOutNames;
+			outputTypes["merge"] = tempOutNames;
+			
+			//if the user changes the input directory command factory will send this info to us in the output parameter 
+			string inputDir = validParameter.validFile(parameters, "inputdir", false);		
+			if (inputDir == "not found"){	inputDir = "";		}
+			
 			string fileList = validParameter.validFile(parameters, "input", false);			
-			if(fileList == "not found") { mothurOut("you must enter two or more file names"); mothurOutEndLine();  abort=true;  }
-			else{ 	splitAtDash(fileList, fileNames);	}
+			if(fileList == "not found") { m->mothurOut("you must enter two or more file names"); m->mothurOutEndLine();  abort=true;  }
+			else{ 	m->splitAtDash(fileList, fileNames);	}
+			
+			//if the user changes the output directory command factory will send this info to us in the output parameter 
+			string outputDir = validParameter.validFile(parameters, "outputdir", false);		if (outputDir == "not found")	{	outputDir = "";		}
+			
 			
 			numInputFiles = fileNames.size();
 			ifstream testFile;
 			if(numInputFiles == 0){
-				mothurOut("you must enter two or more file names and you entered " + toString(fileNames.size()) +  " file names"); mothurOutEndLine();
+				m->mothurOut("you must enter two or more file names and you entered " + toString(fileNames.size()) +  " file names"); m->mothurOutEndLine();
 				abort=true;  
 			}
 			else{
 				for(int i=0;i<numInputFiles;i++){
-					if(openInputFile(fileNames[i], testFile)){	abort = true;	}
+					if (inputDir != "") {
+						string path = m->hasPath(fileNames[i]);
+						//if the user has not given a path then, add inputdir. else leave path alone.
+						if (path == "") {	fileNames[i] = inputDir + fileNames[i];		}
+					}
+					
+					if(m->openInputFile(fileNames[i], testFile)){	abort = true;	}
 					testFile.close();
 				}
 			}   
 			
 			outputFileName = validParameter.validFile(parameters, "output", false);			
-			if (outputFileName == "not found") { mothurOut("you must enter an output file name"); mothurOutEndLine();  abort=true;  }
+			if (outputFileName == "not found") { m->mothurOut("you must enter an output file name"); m->mothurOutEndLine();  abort=true;  }
+			else if (outputDir != "") { outputFileName = outputDir + m->getSimpleName(outputFileName);  }
 		}
 			
 	}
 	catch(exception& e) {
-		errorOut(e, "MergeFileCommand", "MergeFileCommand");
+		m->errorOut(e, "MergeFileCommand", "MergeFileCommand");
 		exit(1);
 	}
 }
@@ -70,27 +136,41 @@ MergeFileCommand::~MergeFileCommand()	{	/*	do nothing	*/	}
 
 int MergeFileCommand::execute(){
 	try {
-		if (abort == true) {	return 0;	}
+		if (abort == true) { if (calledHelp) { return 0; }  return 2;	}
 		
 		ofstream outputFile;
-		openOutputFile(outputFileName, outputFile);
+		m->openOutputFile(outputFileName, outputFile);
 		
 		char c;
 		for(int i=0;i<numInputFiles;i++){
 			ifstream inputFile; //declaration must be inside for loop of windows throws an error
 			
-			openInputFile(fileNames[i], inputFile);
+			m->openInputFile(fileNames[i], inputFile);
 			
-			while(!inputFile.eof()){	c = inputFile.get(); outputFile << c;	}
+			while(!inputFile.eof()){	
+				if (m->control_pressed) { outputTypes.clear(); inputFile.close(); outputFile.close(); remove(outputFileName.c_str()); return 0;  }
+			
+				c = inputFile.get(); 
+				//-1 is eof char
+				if (int(c) != -1) { outputFile << c; }   
+			}
 			
 			inputFile.close();
 		}
 		
 		outputFile.close();
+		
+		if (m->control_pressed) { outputTypes.clear();  remove(outputFileName.c_str()); return 0;  }
+		
+		m->mothurOutEndLine();
+		m->mothurOut("Output File Name: "); m->mothurOutEndLine();
+		m->mothurOut(outputFileName); m->mothurOutEndLine();	outputNames.push_back(outputFileName); outputTypes["merge"].push_back(outputFileName);
+		m->mothurOutEndLine();
+
 		return 0;
 	}
 	catch(exception& e) {
-		errorOut(e, "MergeFileCommand", "execute");
+		m->errorOut(e, "MergeFileCommand", "execute");
 		exit(1);
 	}
 }
@@ -99,10 +179,10 @@ int MergeFileCommand::execute(){
 
 void MergeFileCommand::help(){
 	try {
-		mothurOut("The merge.file command..."); mothurOutEndLine();
+		m->mothurOut("The merge.file command..."); m->mothurOutEndLine();
 	}
 	catch(exception& e) {
-		errorOut(e, "MergeFileCommand", "help");
+		m->errorOut(e, "MergeFileCommand", "help");
 		exit(1);
 	}
 }