X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makebiomcommand.cpp;fp=makebiomcommand.cpp;h=70e3b1ad94698cc6369d64555dd70ed889a9c841;hb=9d241ddf4c0e2467298a523e21a3b0de46902448;hp=41f2316b3a036840208635d3abbacd89e59f6413;hpb=7dab6ac3ae5a5f1ce37dca8cfacaa719881fd5b2;p=mothur.git diff --git a/makebiomcommand.cpp b/makebiomcommand.cpp index 41f2316..70e3b1a 100644 --- a/makebiomcommand.cpp +++ b/makebiomcommand.cpp @@ -168,7 +168,7 @@ MakeBiomCommand::MakeBiomCommand(string option) { //initialize outputTypes vector tempOutNames; - outputTypes["relabund"] = tempOutNames; + outputTypes["biom"] = tempOutNames; //if the user changes the input directory command factory will send this info to us in the output parameter string inputDir = validParameter.validFile(parameters, "inputdir", false); @@ -328,6 +328,14 @@ int MakeBiomCommand::execute(){ if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } + //set sabund file as new current sabundfile + string current = ""; + itTypes = outputTypes.find("biom"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setBiomFile(current); } + } + + m->mothurOutEndLine(); m->mothurOut("Output File Names: "); m->mothurOutEndLine(); for (int i = 0; i < outputNames.size(); i++) { m->mothurOut(outputNames[i]); m->mothurOutEndLine(); }