|
|
@@ -1681,12 +1681,9 @@ bool ClusterSplitCommand::findVsearch(){ |
|
|
|
|
|
if (cutoffNotSet) { m->mothurOut("\nYou did not set a cutoff, using 0.03.\n"); cutoff = 0.03; }
|
|
|
|
|
|
- //look for uchime exe
|
|
|
+ //look for vsearch exe
|
|
|
string path = m->mothurProgramPath;
|
|
|
- //string tempPath = path;
|
|
|
- //for (int i = 0; i < path.length(); i++) { tempPath[i] = tolower(path[i]); }
|
|
|
- //path = path.substr(0, (tempPath.find_last_of('m')));
|
|
|
-
|
|
|
+
|
|
|
string vsearchCommand;
|
|
|
#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
|
|
|
vsearchCommand = path + "vsearch"; // format the database, -o option gives us the ability
|
|
|
@@ -1704,13 +1701,13 @@ bool ClusterSplitCommand::findVsearch(){ |
|
|
vsearchCommand = path + "\\vsearch.exe";
|
|
|
#endif
|
|
|
|
|
|
- //test to make sure uchime exists
|
|
|
+ //test to make sure vsearch exists
|
|
|
ifstream in;
|
|
|
vsearchCommand = m->getFullPathName(vsearchCommand);
|
|
|
int ableToOpen = m->openInputFile(vsearchCommand, in, "no error"); in.close();
|
|
|
if(ableToOpen == 1) {
|
|
|
m->mothurOut(vsearchCommand + " file does not exist. Checking path... \n");
|
|
|
- //check to see if uchime is in the path??
|
|
|
+ //check to see if vsearch is in the path??
|
|
|
|
|
|
ifstream in2;
|
|
|
string uLocation = "";
|
|
|
@@ -1728,9 +1725,7 @@ bool ClusterSplitCommand::findVsearch(){ |
|
|
|
|
|
vsearchLocation = m->getFullPathName(vsearchLocation);
|
|
|
|
|
|
- if (m->debug) {
|
|
|
- m->mothurOut("[DEBUG]: vsearch location using " + vsearchLocation + "\n");
|
|
|
- }
|
|
|
+ if (m->debug) { m->mothurOut("[DEBUG]: vsearch location using " + vsearchLocation + "\n"); }
|
|
|
|
|
|
if (!abort) { return true; }
|
|
|
|
|
|
|
0 comments on commit
57f2df0