fixed line and label bug.

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index 713ae9af7346dbcdffe38e3f38f9f93b1129984d..f706b5308765cc01db2196c92192f22fb1f86302 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -148,12 +148,14 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                                if (key == "line") {//stores lines to be used in a vector
                                        lines.clear();
                                        line = value;
+                                       label = "";
                                        splitAtDash(value, lines);
                                        allLines = 0;
                                }
                                if (key == "label") {//stores lines to be used in a vector
                                        labels.clear();
                                        label = value;
+                                       line = "";
                                        splitAtDash(value, labels);
                                        allLines = 0;
                                }
@@ -214,12 +216,14 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        if (key == "line") {//stores lines to be used in a vector
                                lines.clear();
                                line = value;
+                               label = "";
                                splitAtDash(value, lines);
                                allLines = 0;
                        }
                        if (key == "label") {//stores lines to be used in a vector
                                labels.clear();
                                label = value;
+                               line = "";
                                splitAtDash(value, labels);
                                allLines = 0;
                        }
@@ -335,7 +339,7 @@ void GlobalData::clear() {
        method                  =       "furthest";
        fileroot                =       "";
        single                  =       "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-rarefraction";
-       rarefaction             =       "rarefaction";
+       rarefaction             =       "sobs";
        shared                  =       "sharedSobs-sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN";
        sharedsummary   =   "sharedSobs-sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN";
        summary                 =       "summary-chao-ace-jack-bootstrap-shannon-npshannon-simpson";