X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=setdircommand.cpp;h=043c0acc8ec524c1b510da28c36c149d300f215a;hb=11c115c802602be50e106aae56969e15d2c49a62;hp=b6626b872d31030d791362ec8ebf68f3f3aaa3e6;hpb=e189982e0a9b7352ad57cc38ccee675f128be22e;p=mothur.git

diff --git a/setdircommand.cpp b/setdircommand.cpp
index b6626b8..043c0ac 100644
--- a/setdircommand.cpp
+++ b/setdircommand.cpp
@@ -20,7 +20,7 @@ SetDirectoryCommand::SetDirectoryCommand(string option)  {
 		
 		else {
 			//valid paramters for this command
-			string Array[] =  {"output","input","outputdir","inputdir"};
+			string Array[] =  {"output","input","tempdefault","outputdir","inputdir"};
 			vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
 			
 			OptionParser parser(option);
@@ -37,9 +37,12 @@ SetDirectoryCommand::SetDirectoryCommand(string option)  {
 			
 			input = validParameter.validFile(parameters, "input", false);			
 			if (input == "not found") {  input = "";  }
+			
+			tempdefault = validParameter.validFile(parameters, "tempdefault", false);			
+			if (tempdefault == "not found") {  tempdefault = "";  }
 				
-			if ((input == "") && (output == "")) {	
-				m->mothurOut("You must provide either an input or output for the set.outdir command."); m->mothurOutEndLine(); abort = true;
+			if ((input == "") && (output == "") && (tempdefault == "")) {	
+				m->mothurOut("You must provide either an input, output or tempdefault for the set.outdir command."); m->mothurOutEndLine(); abort = true;
 			}
 		}
 	}
@@ -54,10 +57,15 @@ void SetDirectoryCommand::help(){
 	try {
 		m->mothurOut("The set.dir command can be used to direct the output files generated by mothur to a specific place, the directory must exist.\n");
 		m->mothurOut("The set.dir command can also be used to specify the directory where your input files are located, the directory must exist.\n");
-		m->mothurOut("The set.dir command parameter is output and is required.\n");
+		m->mothurOut("The set.dir command can also be used to override or set the default location mothur will look for files if it is unable to find them, the directory must exist.\n");
+		m->mothurOut("The set.dir command parameters are input, output and tempdefault and one is required.\n");
 		m->mothurOut("To return the output to the same directory as the input files you may enter: output=clear.\n");
-		m->mothurOut("To return the input to the same directory as the mothur.exe you may enter: input=clear.\n");
-		m->mothurOut("The set.dir command should be in the following format: set.dir(output=yourOutputDirectory, input=yourInputDirectory).\n");
+		m->mothurOut("To return the input to the current working directory you may enter: input=clear.\n");
+		m->mothurOut("To set the output to the directory where mothur.exe is located you may enter: output=default.\n");
+		m->mothurOut("To set the input to the directory where mothur.exe is located you may enter: input=default.\n");
+		m->mothurOut("To return the tempdefault to the default you provided at compile time you may enter: tempdefault=clear.\n");
+		m->mothurOut("To set the tempdefault to the directory where mothur.exe is located you may enter: tempdefault=default.\n");
+		m->mothurOut("The set.dir command should be in the following format: set.dir(output=yourOutputDirectory, input=yourInputDirectory, tempdefault=yourTempDefault).\n");
 		m->mothurOut("Example set.outdir(output=/Users/lab/desktop/outputs, input=/Users/lab/desktop/inputs).\n");
 		m->mothurOut("Note: No spaces between parameter labels (i.e. output), '=' and parameters (i.e.yourOutputDirectory).\n\n");
 	}
@@ -81,7 +89,14 @@ int SetDirectoryCommand::execute(){
 		
 		//redirect output
 		if ((output == "clear") || (output == "")) {  output = "";  commandFactory->setOutputDirectory(output);  }
-		else {
+		else if (output == "default") { 
+			GlobalData* globaldata = GlobalData::getInstance();
+			string exepath = globaldata->argv;
+			output = exepath.substr(0, (exepath.find_last_of('m')));
+			
+			m->mothurOut("Changing output directory to " + output); m->mothurOutEndLine();  
+			commandFactory->setOutputDirectory(output);
+		}else {
 			//add / to name if needed
 			string lastChar = output.substr(output.length()-1);
 			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
@@ -107,7 +122,14 @@ int SetDirectoryCommand::execute(){
 		
 		//redirect input
 		if ((input == "clear") || (input == "")) {  input = "";  commandFactory->setInputDirectory(input);  }
-		else {
+		else if (input == "default") { 
+			GlobalData* globaldata = GlobalData::getInstance();
+			string exepath = globaldata->argv;
+			input = exepath.substr(0, (exepath.find_last_of('m')));
+			
+			m->mothurOut("Changing input directory to " + input); m->mothurOutEndLine();  
+			commandFactory->setInputDirectory(input);
+		}else {
 			//add / to name if needed
 			string lastChar = input.substr(input.length()-1);
 			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
@@ -130,11 +152,43 @@ int SetDirectoryCommand::execute(){
 				commandFactory->setInputDirectory(input); 
 			}
 		}
+		
+		//set default
+		if (tempdefault == "clear") {  
+			#ifdef MOTHUR_FILES
+				string temp = MOTHUR_FILES; 
+				m->mothurOut("Resetting default directory to " + temp); m->mothurOutEndLine();  
+				m->setDefaultPath(temp);
+			#else
+				string temp = ""; 
+				m->mothurOut("No default directory defined at compile time."); m->mothurOutEndLine();  
+				m->setDefaultPath(temp);
+			#endif
+		}else if (tempdefault == "") {  //do nothing
+		}else if (tempdefault == "default") { 
+			GlobalData* globaldata = GlobalData::getInstance();
+			string exepath = globaldata->argv;
+			tempdefault = exepath.substr(0, (exepath.find_last_of('m')));
+			
+			m->mothurOut("Changing default directory to " + tempdefault); m->mothurOutEndLine();  
+			m->setDefaultPath(tempdefault);
+		}else {
+			//add / to name if needed
+			string lastChar = tempdefault.substr(tempdefault.length()-1);
+			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+				if (lastChar != "/") { tempdefault += "/"; }
+			#else
+				if (lastChar != "\\") { tempdefault += "\\"; }	
+			#endif
+			
+			m->mothurOut("Changing default directory to " + tempdefault); m->mothurOutEndLine();  
+			m->setDefaultPath(tempdefault);
+		}
 
 		return 0;
 	}
 	catch(exception& e) {
-		m->errorOut(e, "SetDirectoryCommand", "SetDirectoryCommand");
+		m->errorOut(e, "SetDirectoryCommand", "execute");
 		exit(1);
 	}
 }