rarefaction.shared() fixed bug

[mothur.git] / readmatrix.cpp

diff --git a/readmatrix.cpp b/readmatrix.cpp
index 0b9e3ecab013fa7296f47dda15654b83069b820e..78a4bd4efe97b355513c51bec77616cbefa6a4e7 100644 (file)
--- a/readmatrix.cpp
+++ b/readmatrix.cpp
@@ -352,14 +352,14 @@ void ReadPhilFile::read(GlobalData* globaldata){
                }
                globaldata->ginput = input;     //saving to be used by collector and rarefact commands.
                
-               if (globaldata->getGroupFile() == "") {//you are reading a list, rabund or sabund file for collect, rarefaction or summary.
+               if ((globaldata->getFormat() == "list") || (globaldata->getFormat() == "rabund") || (globaldata->getFormat() == "sabund")) {//you are reading a list, rabund or sabund file for collect, rarefaction or summary.
                        order = input->getOrderVector();
                        globaldata->gorder = order;     //saving to be used by collect and rarefact commands.
                        sabund = inputSabund->getSAbundVector(); 
                        globaldata->sabund = sabund; //saving to be used by summary command.
-               }else {
-                       list = input->getListVector(); //you are reading for parselist command, or shared commands.
-                       globaldata->glist = list;
+               }else if (globaldata->getFormat() == "shared") {
+                       SharedList = input->getSharedListVector(); //you are reading for parselist command, or shared commands.
+                       globaldata->gSharedList = SharedList;
                }
        }
        catch(exception& e) {