X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mothurout.h;h=1747b1480c732ae42f361940ff57dcbe151bbc7b;hp=9987374e6c824cafe4aaf343c319d5bca14f209b;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=bcb6728939694811bf6a00ae6d568f783840edfd

diff --git a/mothurout.h b/mothurout.h
index 9987374..1747b14 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -66,11 +66,11 @@ class MothurOut {
 	
 		vector<string> getAllGroups() { sort(namesOfGroups.begin(), namesOfGroups.end()); return namesOfGroups; }
 		vector<string> Treenames;
-		//map<string, string> names;
-		vector<string> binLabelsInFile;
-		vector<string> currentBinLabels;
+		vector<string> sharedBinLabelsInFile;
+		vector<string> currentSharedBinLabels;
+        vector<string> listBinLabelsInFile;
 		string saveNextLabel, argv, sharedHeaderMode, groupMode;
-		bool printedHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
+		bool printedSharedHeaders, printedListHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
 		
 		//functions from mothur.h
 		//file operations
@@ -82,6 +82,7 @@ class MothurOut {
 		vector<unsigned long long> setFilePosFasta(string, int&);
 		string sortFile(string, string);
 		int appendFiles(string, string);
+        int appendBinaryFiles(string, string);
         int appendFilesWithoutHeaders(string, string);
 		int renameFile(string, string); //oldname, newname
 		string getFullPathName(string);
@@ -97,7 +98,11 @@ class MothurOut {
 		int openOutputFileAppend(string, ofstream&);
         int openOutputFileBinaryAppend(string, ofstream&);
 		int openInputFile(string, ifstream&);
-		int openInputFile(string, ifstream&, string); //no error given 
+        int openInputFileBinary(string, ifstream&);
+        int openInputFileBinary(string, ifstream&, string);
+		int openInputFile(string, ifstream&, string); //no error given
+    
+        bool checkLocations(string&, string);  //filename, inputDir. checks for file in ./, inputdir, default and mothur's exe location.  Returns false if cant be found. If found completes name with location
 		string getline(ifstream&);
 		string getline(istringstream&);
 		void gobble(istream&);
@@ -138,6 +143,8 @@ class MothurOut {
 		bool isTrue(string);
 		bool isContainingOnlyDigits(string);
 		bool isNumeric1(string);
+        bool isLabelEquivalent(string, string);
+        string getSimpleLabel(string);
         string findEdianness();
 	
 		
@@ -268,7 +275,8 @@ class MothurOut {
             counttablefile = "";
             summaryfile = "";
 			gui = false;
-			printedHeaders = false;
+			printedSharedHeaders = false;
+            printedListHeaders = false;
 			commandInputsConvertError = false;
             mothurCalling = false;
             debug = false;