X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makebiomcommand.h;h=7ea381f145af343213a25bd32109d20fa1fb1dee;hb=541bab1dac00688b4c3a8c4a95ab464412663c50;hp=8a458fe33a398de607ffe05e48a5950b9368353c;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git

diff --git a/makebiomcommand.h b/makebiomcommand.h
index 8a458fe..7ea381f 100644
--- a/makebiomcommand.h
+++ b/makebiomcommand.h
@@ -25,8 +25,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "make.biom";	}
 	string getCommandCategory()		{ return "General";		}
-	string getOutputFileNameTag(string, string);
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://biom-format.org/documentation/biom_format.html, http://www.mothur.org/wiki/Make.biom"; }
 	string getDescription()		{ return "creates a biom file"; }
     
@@ -35,8 +36,8 @@ public:
 	
 private:
     
-	string sharedfile, contaxonomyfile, groups, outputDir, format, label;
-	vector<string> outputNames, Groups;
+	string sharedfile, contaxonomyfile, metadatafile, groups, outputDir, format, label;
+	vector<string> outputNames, Groups, sampleMetadata;
 	set<string> labels;
     
 	bool abort, allLines;
@@ -44,6 +45,7 @@ private:
     int getBiom(vector<SharedRAbundVector*>&);
     vector<string> getMetaData(vector<SharedRAbundVector*>&);
     vector<string> parseTax(string tax, vector<string>& scores);
+    int getSampleMetaData(vector<SharedRAbundVector*>&);
 };