Changeset 8942 for trunk

Timestamp:

06/12/08 16:02:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• msql/MSQLMagic.cc (modified) (3 diffs)
• msql/MSQLMagic.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -89 +89 @@
      - the number of events in format version V9 seems to be
        to high by one. We correct for this.
+
+   * msql/MSQLMagic.[h,cc]:
+     - fixed InsertUpdate. The primary key was not inserted 
+       if Insert was called
 
 

trunk/MagicSoft/Mars/NEWS

@@ -71 +71 @@
    * Implemented cc file version 2008-20-02/0
 
-   * Added Pyroemeter information to output (stored in a new Tree
+   * Added Pyrometer information to output (stored in a new Tree
      Pyrometer, needs a complete new merpp, i.e. new calibration)
 

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -217 +217 @@
 // In Dummy mode no query is send an -1 is returned.
 //
-Int_t MSQLMagic::Insert(const char *table, const char *vars)
+Int_t MSQLMagic::Insert(const char *table, const char *vars, const char *where)
 {
     // Build query
@@ -224 +224 @@
     query += " SET ";
     query += vars;
+    if (!TString(where).IsNull())
+    {
+        query += ", ";
+        query += where;
+    }
 
     // Check for dummy mode
@@ -286 +291 @@
     return ExistStr(col, table, val) ?
         Update(table, vars, Form("%s=%s", col, val)) :
-        Insert(table, vars);
+        Insert(table, vars, Form("%s=%s", col, val));
 }
 

trunk/MagicSoft/Mars/msql/MSQLMagic.h

@@ -46 +46 @@
     Bool_t  ExistStr(const char *column, const char *table, const char *test);
 
-    Int_t Insert(const char *table, const char *vars);
+    Int_t Insert(const char *table, const char *vars, const char *where=0);
     Int_t Update(const char *table, const char *vars, const char *where);
     Int_t Delete(const char *table, const char *where);