Changeset 4877

Timestamp:

09/07/04 11:43:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msql

Files:

• MSQLServer.cc (modified) (3 diffs)
• MSQLServer.h (modified) (3 diffs)

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -46 +46 @@
 
 #include <TH1.h>
+#include <TEnv.h>
 
 #include <TSQLResult.h>
@@ -503 +504 @@
 }
 
-void MSQLServer::Init(const char *connection, const char *user, const char *password) /*FOLD00*/
-{
-    fType = kIsZombie;
-
-    fServ = TSQLServer::Connect(connection, user, password);
-    if (fServ)
-    {
-        gROOT->GetListOfBrowsables()->Add(this, connection);
-        fType = kIsServer;
-    }
-    else
-        SetBit(kZombie);
-
-    fList.SetOwner();
-}
-
-MSQLServer::MSQLServer(const char *connection, const char *user, const char *password) /*FOLD00*/
-{
-    Init(connection, user, password);
-}
-
-MSQLServer::MSQLServer(const char *u) : fType(kIsZombie) /*FOLD00*/
-{
-    TString url(u);
-
+Bool_t MSQLServer::Split(TString &url, TString &user, TString &pasw) const
+{
     const Ssiz_t pos1 = url.First("://")+3;
     const Ssiz_t pos2 = url.Last(':')   +1;
@@ -533 +511 @@
 
     if (pos1<0 || pos2<0 || pos3<0 || pos1>pos2 || pos2>pos3)
-    {
+        return kFALSE;
+
+    user = url(pos1, pos2-pos1-1);
+    pasw = url(pos2, pos3-pos2);
+
+    url.Remove(pos1, pos3+1-pos1);
+
+    return kTRUE;
+}
+
+void MSQLServer::Init(const char *connection, const char *user, const char *password) /*FOLD00*/
+{
+    fType = kIsZombie;
+
+    fServ = TSQLServer::Connect(connection, user, password);
+    if (fServ)
+    {
+        gROOT->GetListOfBrowsables()->Add(this, connection);
+        fType = kIsServer;
+    }
+    else
         SetBit(kZombie);
+
+    fList.SetOwner();
+}
+
+void MSQLServer::InitEnv(TEnv &env, const char *prefix)
+{
+    TString url; 
+    TString user;
+    TString pass;
+
+    if (prefix)
+    {
+        url  = env.GetValue(Form("%s.URL", prefix),      "");
+        user = env.GetValue(Form("%s.User", prefix),     "");
+        pass = env.GetValue(Form("%s.Password", prefix), "");
+    }
+    if (url.IsNull())
+        url  = env.GetValue("URL",      "");
+    if (user.IsNull())
+        user = env.GetValue("User",     "");
+    if (pass.IsNull())
+        pass = env.GetValue("Password", "");
+
+    if (user.IsNull() && pass.IsNull())
+    {
+        if (!Split(url, user, pass))
+        {
+            SetBit(kIsZombie);
+            return;
+        }
+    }
+
+    Init(url, user, pass);
+}
+
+MSQLServer::MSQLServer(const char *connection, const char *user, const char *password) /*FOLD00*/
+{
+    Init(connection, user, password);
+}
+
+MSQLServer::MSQLServer(const char *u) : fType(kIsZombie) /*FOLD00*/
+{
+    TString url(u);
+    TString user, pasw;
+
+    if (!Split(url, user, pasw))
+    {
+        SetBit(kIsZombie);
         return;
     }
-
-    const TString user = url(pos1, pos2-pos1-1);
-    const TString pasw = url(pos2, pos3-pos2);
-
-    url.Remove(pos1, pos3+1-pos1);
-
     Init(url, user, pasw);
+}
+
+MSQLServer::MSQLServer(TEnv &env, const char *prefix)
+{
+    InitEnv(env, prefix);
+}
+
+MSQLServer::MSQLServer()
+{
+    if (gEnv)
+        InitEnv(*gEnv);
 }
 

trunk/MagicSoft/Mars/msql/MSQLServer.h

@@ -6 +6 @@
 #endif
 
+class TEnv;
 class TArrayI;
+
 class TSQLServer;
 class TSQLResult;
@@ -55 +57 @@
     const char *GetNameColumn()   const { return Form("%s/%s/%s", (const char*)fDataBase, (const char*)fTable, (const char*)fColumn); }
 
+    Bool_t Split(TString &url, TString &user, TString &pasw) const;
+
     void Init(const char *connection, const char *user, const char *password);
+    void InitEnv(TEnv &env, const char *prefix=0);
 
 public:
@@ -80 +85 @@
     MSQLServer(const char *connection, const char *user, const char *password);
     MSQLServer(const char *link);
+    MSQLServer(TEnv &env, const char *prefix=0);
+    MSQLServer();
     ~MSQLServer();