X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=validparameter.cpp;h=7d1af2551c7a6717c1d3ea807af0e56de0fc218e;hp=38a90940095b799634494a20ddf3d1688f2a0f3a;hb=615301e57c25e241356a9c2380648d117709458d;hpb=260ae19c36cb11a53ddc5a75b5e507f8dd8b31d6

diff --git a/validparameter.cpp b/validparameter.cpp
index 38a9094..7d1af25 100644
--- a/validparameter.cpp
+++ b/validparameter.cpp
@@ -214,13 +214,17 @@ bool ValidParameters::isValidParameter(string parameter, vector<string> cParams,
 string ValidParameters::validFile(map<string, string>& container, string parameter, bool isFile) {
 	try {
 		int ableToOpen;
-		ifstream in;
+		
 		map<string, string>::iterator it;
 		
 		it = container.find(parameter);
 		if(it != container.end()){ //no parameter given
 
 			if(isFile == true) {
+				
+				int pos = (it->second).find(".tx.");
+				if (pos != string::npos) { m->sharedHeaderMode = "tax"; }
+				else { m->sharedHeaderMode = "otu"; }
 			
 			#ifdef USE_MPI	
 				int pid, processors;
@@ -232,20 +236,35 @@ string ValidParameters::validFile(map<string, string>& container, string paramet
 				
 				if (pid == 0) {
 			#endif
-
+				ifstream in;
 				ableToOpen = m->openInputFile(it->second, in, "noerror");
+				in.close();
 				
 				//if you can't open it, try default location
 				if (ableToOpen == 1) {
 					if (m->getDefaultPath() != "") { //default path is set
 						string tryPath = m->getDefaultPath() + m->getSimpleName(it->second);
 						m->mothurOut("Unable to open " + it->second + ". Trying default " + tryPath); m->mothurOutEndLine();
-						ableToOpen = m->openInputFile(tryPath, in, "noerror");
+						ifstream in2;
+						ableToOpen = m->openInputFile(tryPath, in2, "noerror");
+						in2.close();
 						container[parameter] = tryPath;
 					}
 				}
 				
-				in.close();
+				//if you can't open it, try default location
+				if (ableToOpen == 1) {
+					if (m->getOutputDir() != "") { //default path is set
+						string tryPath = m->getOutputDir() + m->getSimpleName(it->second);
+						m->mothurOut("Unable to open " + it->second + ". Trying output directory " + tryPath); m->mothurOutEndLine();
+						ifstream in2;
+						ableToOpen = m->openInputFile(tryPath, in2, "noerror");
+						container[parameter] = tryPath;
+						in2.close();
+					}
+				}
+				
+				
 
 			#ifdef USE_MPI	
 					for(int i = 1; i < processors; i++) { 
@@ -276,6 +295,26 @@ string ValidParameters::validFile(map<string, string>& container, string paramet
 					m->mothurOut("Unable to open " + container[parameter]); m->mothurOutEndLine();
 					return "not open"; 
 				}
+				
+				//check phylip file to make sure its really phylip and not column
+				if ((it->first == "phylip") && (ableToOpen != 1)) {
+					ifstream inPhylip;
+					m->openInputFile(it->second, inPhylip);
+										
+					string numTest, name;
+					inPhylip >> numTest >> name;
+					inPhylip.close();
+					
+					if (!m->isContainingOnlyDigits(numTest)) { m->mothurOut("[ERROR]: expected a number and got " + numTest + ". I suspect you entered a column formatted file as a phylip file, aborting."); m->mothurOutEndLine(); return "not found"; }
+				}
+                
+                //check for blank file
+                if (ableToOpen != 1) {
+                    if (m->isBlank(container[parameter])) {
+                        m->mothurOut("[ERROR]: " + container[parameter] + " is blank, aborting."); m->mothurOutEndLine(); return "not found"; 
+                    }
+                }
+                    
 			}
 		}else { return "not found"; }
 		
@@ -309,7 +348,7 @@ void ValidParameters::initParameterRanges() {
 		string precisionArray[] = {">=","10", "<","NA", "between"};
 		parameterRanges["precision"] = addParameters(precisionArray, rangeSize);
 		
-		string itersArray[] = {">=","10", "<","NA", "between"};
+		string itersArray[] = {">=","1", "<","NA", "between"};
 		parameterRanges["iters"] = addParameters(itersArray, rangeSize);
 
 		string abundArray[] = {">=","5", "<","NA", "between"};