X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectcommand.cpp;h=473d2db8b473bbef240793c419e6c8beece29ddf;hb=a218321731df14d231bbc08e79906f757cf1540d;hp=a31883cf3c65aabf3955d12191b91b9ad9fe050c;hpb=315e38cf393c82be238da5b32574f225a020d25c;p=mothur.git diff --git a/collectcommand.cpp b/collectcommand.cpp index a31883c..473d2db 100644 --- a/collectcommand.cpp +++ b/collectcommand.cpp @@ -136,17 +136,17 @@ int CollectCommand::execute(){ if ((globaldata->getFormat() != "sharedfile")) { inputFileNames.push_back(globaldata->inputFileName); } else { inputFileNames = parseSharedFile(globaldata->getSharedFile()); globaldata->setFormat("rabund"); } - + for (int p = 0; p < inputFileNames.size(); p++) { - + if (outputDir == "") { outputDir += hasPath(inputFileNames[p]); } string fileNameRoot = outputDir + getRootName(getSimpleName(inputFileNames[p])); globaldata->inputFileName = inputFileNames[p]; - + if (inputFileNames.size() > 1) { mothurOutEndLine(); mothurOut("Processing group " + groups[p]); mothurOutEndLine(); mothurOutEndLine(); } - + validCalculator = new ValidCalculators(); for (int i=0; iread(&*globaldata); - + order = globaldata->gorder; string lastLabel = order->getLabel(); input = globaldata->ginput;