From: westcott <westcott>
Date: Tue, 26 Oct 2010 16:36:02 +0000 (+0000)
Subject: done testing 1.14.0
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=134a9c1275862a6b3ea10a2c0f11965c0a535854

done testing 1.14.0
---

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index 4a328a3..a677e4c 100644
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -1112,7 +1112,6 @@
 			};
 			buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "Mothur" */;
 			compatibilityVersion = "Xcode 3.0";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
diff --git a/makefile b/makefile
index 4e05718..3d0e18d 100644
--- a/makefile
+++ b/makefile
@@ -28,9 +28,9 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	 CXXFLAGS += -DBIT_VERSION
 endif
 
-MOTHUR_FILES = "\"../Release\""
+MOTHUR_FILES = "\"../release\""
 
-RELEASE_DATE = "\"10/22/2010\""
+RELEASE_DATE = "\"10/26/2010\""
 VERSION = "\"1.14.0\""
 
 CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
diff --git a/mothur b/mothur
index 1255e3a..f752264 100755
Binary files a/mothur and b/mothur differ
diff --git a/pipelinepdscommand.cpp b/pipelinepdscommand.cpp
index ae2663d..a174cce 100644
--- a/pipelinepdscommand.cpp
+++ b/pipelinepdscommand.cpp
@@ -358,6 +358,8 @@ bool PipelineCommand::checkForValidAndRequiredParameters(string name, string opt
 				
 		if (name == "system") { return false; }
 		
+		if (name == "system") { return false; }
+		
 		//get shell of the command so we can check to make sure its valid without running it
 		Command* command = cFactory->getCommand(name);
 			
diff --git a/removeseqscommand.cpp b/removeseqscommand.cpp
index c0e04d5..f1804ed 100644
--- a/removeseqscommand.cpp
+++ b/removeseqscommand.cpp
@@ -404,7 +404,7 @@ int RemoveSeqsCommand::readName(){
 		while(!in.eof()){
 			if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
 
-			in >> firstCol;				
+			in >> firstCol;		m->gobble(in);		
 			in >> secondCol;			
 
 			vector<string> parsedNames;
diff --git a/screenseqscommand.cpp b/screenseqscommand.cpp
index 8a7a108..30dda1f 100644
--- a/screenseqscommand.cpp
+++ b/screenseqscommand.cpp
@@ -1007,6 +1007,9 @@ int ScreenSeqsCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File&
 					delete buf3;
 				}
 			}
+			
+			//report progress
+			if((i) % 100 == 0){	m->mothurOut("Processing sequence: " + toString(i)); m->mothurOutEndLine();		}
 		}
 				
 		return 1;