try {
if (abort == true) { return 0; }
-
+
//prepare filename
string outputName = outputDir + m->getRootName(m->getSimpleName(inputFile)) + "tre";
if (shuffle) { char* temp = new char[9]; strcpy(temp, "--shuffle"); cPara.push_back(temp); }
if (neighbor) { char* temp = new char[10]; strcpy(temp, "--neighbor"); cPara.push_back(temp); }
- string tempIn = "";
- #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
- tempIn += "--in=" + inputFile;
- #else
- tempIn += "--in=\"" + inputFile + "\"";
- #endif
-
+ string tempIn = "--in=" + inputFile;
char* tempI = new char[tempIn.length()];
strcpy(tempI, tempIn.c_str());
cPara.push_back(tempI);
if (stdoutWanted) { char* temp = new char[8]; strcpy(temp, "--stdout"); cPara.push_back(temp); }
else{
- string tempOut = "";
- #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
- tempOut += "--out=" + outputName;
- #else
- tempOut += "--out=\"" + outputName + "\"";
- #endif
+ string tempOut = "--out=" + outputName;
char* temp = new char[tempOut.length()];
strcpy(temp, tempOut.c_str());
if (jukes) { char* temp = new char[7]; strcpy(temp, "--jukes"); cPara.push_back(temp); }
if (kimura) { char* temp = new char[8]; strcpy(temp, "--kimura"); cPara.push_back(temp); }
if (matrixout != "") {
- string tempMatrix = "--matrixout=" + matrixout;
+ string tempMatrix = "--matrixout=" + outputDir + matrixout;
char* temp = new char[tempMatrix.length()];
strcpy(temp, tempMatrix.c_str());
cPara.push_back(temp);
m->mothurOutEndLine();
m->mothurOut("Output File Names: "); m->mothurOutEndLine();
m->mothurOut(outputName); m->mothurOutEndLine();
- if (matrixout != "") { m->mothurOut(matrixout); m->mothurOutEndLine(); }
+ if (matrixout != "") { m->mothurOut(outputDir+matrixout); m->mothurOutEndLine(); }
m->mothurOutEndLine();
}