Changeset 15440 for trunk/Mars

Timestamp:

04/25/13 14:32:54 (12 years ago)

Author:

tbretz

Message:

Support more than one MTreeSQL per database connection.

Location:

trunk/Mars/msql

Files:

• MSQLServer.cc (modified) (4 diffs)
• MSQLServer.h (modified) (3 diffs)
• MTreeSQL.cc (modified) (1 diff)

trunk/Mars/msql/MSQLServer.cc

@@ -447 +447 @@
         if (TestBit(kIsOwner))
         {
-            if (fTree)
-                delete fTree;
+            fTrees.Delete();
 
             delete fServ;
@@ -626 +625 @@
         fType = kIsZombie;
 
-    fTree = 0;
     fList.SetOwner();
 }
@@ -720 +718 @@
 {
     fServ = serv.fServ;
-    fTree = 0;
 
     fDataBase = serv.fDataBase;
@@ -881 +878 @@
 }
 
-MTreeSQL *MSQLServer::GetTree(const char *table, const char *addon)
+MTreeSQL *MSQLServer::GetTree(TString table, TString addon)
 {
     if (fType!=kIsServer || !fServ || !TestBit(kIsOwner))
         return 0;
 
-    if (!fTree)
-        fTree = new MTreeSQL(this, table, addon);
-
-    return fTree;
+    TIter Next(&fTrees);
+    TObject *o = 0;
+    while ((o=Next()))
+    {
+        if (o->GetName()==table && o->GetName()==addon)
+            return (MTreeSQL*)o;
+    }
+
+    MTreeSQL *t = new MTreeSQL(this, table, addon);
+    fTrees.Add(t);
+
+    return t;
 }
 

trunk/Mars/msql/MSQLServer.h

@@ -18 +18 @@
 private:
     TSQLServer *fServ;
-    MTreeSQL   *fTree;
+    TList fTrees;
 
     TString fDataBase;
@@ -69 +69 @@
 public:
     MSQLServer(TSQLServer *serv, const char *dbname=0, const char *tname=0, const char *col=0)
-        : fServ(serv), fTree(0), fDataBase(dbname), fTable(tname), fColumn(col), fType(kIsZombie)
+        : fServ(serv), fDataBase(dbname), fTable(tname), fColumn(col), fType(kIsZombie)
     {
         fList.SetOwner();
@@ -131 +131 @@
     void RecursiveRemove(TObject *obj);
 
-    MTreeSQL   *GetTree(const char *table, const char *addon=0);
+    MTreeSQL   *GetTree(TString table, TString addon="");
 
     ClassDef(MSQLServer, 0) // An enhancement of TSQLServer

trunk/Mars/msql/MTreeSQL.cc

@@ -46 +46 @@
 //______________________________________________________________________________
 MTreeSQL::MTreeSQL(MSQLServer *server, const TString& table, const TString &addon) :
-    TTree(table.Data(), "Database read from table: " + table, 0),
-    fServer(server), fQuery(table+" "+addon), fResult(0), fRow(0)
+    TTree(table, addon, 0), fServer(server), fQuery(table+" "+addon), fResult(0), fRow(0)
 {
     fEntries = 0;