fixed valid parameters to include shared parameter for read.shared command.

[mothur.git] / readtreecommand.cpp

diff --git a/readtreecommand.cpp b/readtreecommand.cpp
index 452c0ec7b2fb881d46884832906ebd5053a5e7ae..405de84daef015d5edb37110ab35f0a2c98bbbb3 100644 (file)
--- a/readtreecommand.cpp
+++ b/readtreecommand.cpp
@@ -43,12 +43,19 @@ ReadTreeCommand::~ReadTreeCommand(){
 
 int ReadTreeCommand::execute(){
        try {
-       
-               read->read(); 
+               int readOk;
                
-               Tree* T = globaldata->gTree;
-//             T->createNewickFile();
+               readOk = read->read(); 
                
+               if (readOk != 0) { cout << "Read Terminated." << endl; globaldata->gTree.clear(); delete globaldata->gTreemap; return 0; }
+               
+               vector<Tree*> T = globaldata->gTree;
+               
+               //assemble users trees
+               for (int i = 0; i < T.size(); i++) {
+                       T[i]->assembleTree();
+               }
+
                return 0;
        }
        catch(exception& e) {
@@ -60,4 +67,5 @@ int ReadTreeCommand::execute(){
                exit(1);
        }
 }
-//**********************************************************************************************************************
\ No newline at end of file
+
+//**********************************************************************************************************************