X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=groupmap.cpp;h=0e0be0e8cf2799527e2664bb79b1cdded09e215c;hb=87537e4ee46cae9b7041ae0ed4dbbc229936d37c;hp=8d0662f9c404cb05d4cfed74596a33284d5235d9;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/groupmap.cpp b/groupmap.cpp
index 8d0662f..0e0be0e 100644
--- a/groupmap.cpp
+++ b/groupmap.cpp
@@ -14,7 +14,7 @@
  GroupMap::GroupMap(string filename) {
 	m = MothurOut::getInstance();
 	groupFileName = filename;
-	openInputFile(filename, fileHandle);
+	m->openInputFile(filename, fileHandle);
 	index = 0;
 }
 
@@ -25,11 +25,13 @@
 int GroupMap::readMap() {
 		string seqName, seqGroup;
 		int error = 0;
-	
+
 		while(fileHandle){
-			fileHandle >> seqName;			//read from first column
+			fileHandle >> seqName;	m->gobble(fileHandle);		//read from first column
 			fileHandle >> seqGroup;			//read from second column
 			
+			if (m->control_pressed) {  fileHandle.close();  return 1; }
+	
 			setNamesOfGroups(seqGroup);
 			
 			it = groupmap.find(seqName);
@@ -39,7 +41,7 @@ int GroupMap::readMap() {
 				groupmap[seqName] = seqGroup;	//store data in map
 				seqsPerGroup[seqGroup]++;  //increment number of seqs in that group
 			}
-			gobble(fileHandle);
+			m->gobble(fileHandle);
 		}
 		fileHandle.close();
 		return error;
@@ -59,26 +61,28 @@ string GroupMap::getGroup(string sequenceName) {
 }
 
 /************************************************************/
+
 void GroupMap::setGroup(string sequenceName, string groupN) {
 	groupmap[sequenceName] = groupN;
 }
+
 /************************************************************/
 void GroupMap::setNamesOfGroups(string seqGroup) {
-			int i, count;
-			count = 0;
-			for (i=0; i<namesOfGroups.size(); i++) {
-				if (namesOfGroups[i] != seqGroup) {
-					count++; //you have not found this group
-				}else {
-					break; //you already have it
-				}
-			}
-			if (count == namesOfGroups.size()) {
-				namesOfGroups.push_back(seqGroup); //new group
-				seqsPerGroup[seqGroup] = 0;
-				groupIndex[seqGroup] = index;
-				index++;
-			}
+	int i, count;
+	count = 0;
+	for (i=0; i<namesOfGroups.size(); i++) {
+		if (namesOfGroups[i] != seqGroup) {
+			count++; //you have not found this group
+		}else {
+			break; //you already have it
+		}
+	}
+	if (count == namesOfGroups.size()) {
+		namesOfGroups.push_back(seqGroup); //new group
+		seqsPerGroup[seqGroup] = 0;
+		groupIndex[seqGroup] = index;
+		index++;
+	}
 }
 /************************************************************/
 bool GroupMap::isValidGroup(string groupname) {