added check for blank files in openInputFile, add check for groupfiles that contain...

[mothur.git] / sharedcommand.cpp

diff --git a/sharedcommand.cpp b/sharedcommand.cpp
index 4b35138998b13bfe181c743bdfd50e4f64f60752..717d3aaba162daad61bfcd053f672a3f5f685382 100644 (file)
--- a/sharedcommand.cpp
+++ b/sharedcommand.cpp
@@ -57,12 +57,26 @@ int SharedCommand::execute(){
                //read in listfile
                read = new ReadOTUFile(globaldata->inputFileName);      
                read->read(&*globaldata); 
+               delete read;
 
                input = globaldata->ginput;
                SharedList = globaldata->gSharedList;
                string lastLabel = SharedList->getLabel();
                vector<SharedRAbundVector*> lookup; 
-                               
+               
+               if (SharedList->getNumSeqs() != groupMap->getNumSeqs()) {  
+                       mothurOut("Your group file contains " + toString(groupMap->getNumSeqs()) + " sequences and list file contains " + toString(SharedList->getNumSeqs()) + " sequences. Please correct."); mothurOutEndLine(); 
+                       
+                       //delete memory
+                       for (it3 = filehandles.begin(); it3 != filehandles.end(); it3++) {
+                               delete it3->second;
+                       }
+                       delete SharedList;
+                       globaldata->gSharedList = NULL;
+                       
+                       return(0); 
+               }
+               
                //if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label.
                set<string> processedLabels;
                set<string> userLabels = globaldata->labels;
@@ -131,7 +145,6 @@ int SharedCommand::execute(){
                }
                
                globaldata->gSharedList = NULL;
-               delete read;
                
                out.close();