Changeset 4513 for trunk/MagicSoft/Mars

Timestamp:

08/05/04 15:03:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/sql/readrbk.C (modified) (2 diffs)
• mbase/MTaskInteractive.cc (modified) (5 diffs)
• mmain/MBrowser.cc (modified) (2 diffs)
• msql/MSQLServer.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
  2004/08/05: Thomas Bretz
 
-   * manalysis/MGeomApply.cc:
+   * manalysis/MGeomApply.cc, mimage/MCameraSmooth.[h,cc]:
      - removed dependancy on MBlindPixel
+
+   * macros/sql/readrbk.C, msql/MSQLServer.cc:
+     - fixed some memory leaks - the result of TSQLServer::Query
+       must be deleted
+
+   * mbase/MTaskInteractive.cc:
+     - added some comments
+
+   * mmain/MBrowser.cc:
+     - fixed a bug which caused '/data/MAGIC' not to be shown in
+       the dir-list
+
+   * mmc/MMcEvt.hxx:
+     - added some more particle ids
+
 
 

trunk/MagicSoft/Mars/macros/sql/readrbk.C

@@ -51 +51 @@
     TSQLRow *row;
 
-    TList rows;
+    Bool_t rc = kFALSE;
     while (row=res->Next())
     {
         if ((*row)[0])
-            return kTRUE;
+        {
+            rc = kTRUE;
+            break;
+        }
     }
 
-    return kFALSE;
+    delete res;
+
+    return rc;
 }
 
@@ -146 +151 @@
         query += "\");";
 
-        if (!serv->Query(query))
+        TSQLResult *res = serv->Query(query);
+        if (!res)
             cout << "ERROR: " << query << endl << endl;
         else
+        {
+            delete res;
             num++;
+        }
 
         entry = "";

trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc

@@ -72 +72 @@
 // --------------------------------------------------------------------------
 //
+// Default Constructor. Takes name and title of the interactive task
 //
 MTaskInteractive::MTaskInteractive(const char *name, const char *title) :
@@ -84 +85 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Destructor. Free all resources.
+//
 MTaskInteractive::~MTaskInteractive()
 {
@@ -91 +96 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Calls the function and returns its return value.
+// Called by PreProcess, Process, PostProcess and ReInit.
+//
 inline Int_t MTaskInteractive::Return(Int_t no, void *params)
 {
@@ -107 +117 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Generalized function to set the functions of your interactive task.
+// Called by SetPreProcess, SetProcess, SetPostProcess and SetReInit
+//
 Bool_t MTaskInteractive::Set(void *fcn, Int_t no, const char *params)
 {
@@ -138 +153 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//
+//
 void MTaskInteractive::Free(Int_t no)
 {

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -137 +137 @@
 
     const TGPicture *pic0 = fList->GetPicture("magic_t.xpm");
-    if (!pic0)
+    if (pic0)
     {
+        dir->GetListBox()->Resize(100, 150);
         TGTreeLBEntry *entry = new TGTreeLBEntry(dir->GetListBox()->GetContainer(),
                                                  new TGString("/data/MAGIC"), pic0, 6000,
@@ -144 +145 @@
         TGLayoutHints *laylb = new TGLayoutHints(kLHintsLeft|kLHintsTop, 14, 0, 0, 0);
         dir->AddEntry(entry, laylb);
-        // Note necessary - deleted in ~TGLBContainer: fList->Add(laylb);
-        fList->Add(entry);
+        // Not necessary - deleted in ~TGLBContainer: fList->Add(laylb);
+        // fList->Add(laylb);
     }
 

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -31 +31 @@
 //  many features usefull working with relational tables.
 //
+//  Use it like TSQlServer:
+//    new MSQLServer("mysql://localhost:3306", "hercules", "stdmagicpassword");
+//    // now start your TBrowser
+//    new TBrowser;
+//
 ////////////////////////////////////////////////////////////////////////
 #include "MSQLServer.h"
@@ -72 +77 @@
     const TString desc((*row)[1]);
 
-    //cout << "Column Type: " << desc << endl;
+    delete res;
 
     const Bool_t isnum =
@@ -119 +124 @@
         num++;
     }
+
+    delete res;
 
     if (!isnum)
@@ -297 +304 @@
     TSQLResult *res = fServ->Query(query);
     if (res)
+    {
         PrintTable(res);
+        delete res;
+    }
     else
         cout << "Query failed: " << query << endl;
@@ -519 +529 @@
 
     if (res->GetFieldCount()!=1)
+    {
+        delete res;
         return (PrintError("GetEntry - Number of columns != 1", query), "");
+    }
 
     if (res->GetRowCount()>1)
+    {
+        delete res;
         return (PrintError("GetEntry - Number of rows > 1", query), "");
+    }
 
     if (res->GetRowCount()==0)
+    {
+        delete res;
         return "";
+    }
 
     const char *fld = res->Next()->GetField(0);
     if (!fld)
+    {
+        delete res;
         return (PrintError("GetEntry - Entry is empty", query), "");
-
-    return TString(fld);
-}
+    }
+
+    const TString rc(fld);
+    delete res;
+    return rc;
+}