Changeset 4514 for trunk/MagicSoft/Mars/msql/MSQLServer.cc

Timestamp:

08/05/04 16:13:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msql/MSQLServer.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -460 +460 @@
 }
 
+Bool_t MSQLServer::IsConnected() const
+{
+    return fType==kIsServer ? fServ->IsConnected() : kFALSE;
+}
+
+const char *MSQLServer::GetName() const
+{
+    switch (fType)
+    {
+    case kIsServer:   return Form("%s://%s:%d", fServ->GetDBMS(), fServ->GetHost(), fServ->GetPort());
+    case kIsDataBase: return GetNameDataBase();
+    case kIsTable:    return GetNameTable();
+    case kIsColumn:   return GetNameColumn();
+    default:          return "n/a";
+    }
+}
+
 void MSQLServer::Init(const char *connection, const char *user, const char *password) /*FOLD00*/
 {
+    fType = kIsZombie;
+
     fServ = TSQLServer::Connect(connection, user, password);
     if (fServ)
@@ -469 +488 @@
     }
     else
-        fType = kIsZombie;
+        SetBit(kZombie);
 
     fList.SetOwner();
@@ -479 +498 @@
 }
 
-MSQLServer::MSQLServer(const char *u) /*FOLD00*/
+MSQLServer::MSQLServer(const char *u) : fType(kIsZombie) /*FOLD00*/
 {
     TString url(u);
@@ -488 +507 @@
 
     if (pos1<0 || pos2<0 || pos3<0 || pos1>pos2 || pos2>pos3)
-        return;
+    {
+        SetBit(kZombie);
+        return;
+    }
 
     const TString user = url(pos1, pos2-pos1-1);
@@ -496 +518 @@
 
     Init(url, user, pasw);
-
 }
 
@@ -502 +523 @@
 {
     Close();
-    cout << "Delete: " << GetName() << endl;
+    if (gDebug>0)
+        cout << "Delete: " << GetName() << endl;
 }