Changeset 8107 for trunk/MagicSoft/Mars/datacenter/macros/insertdate.C

Timestamp:

10/17/06 19:13:14 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/macros/insertdate.C (modified) (4 diffs)

trunk/MagicSoft/Mars/datacenter/macros/insertdate.C

@@ -45 +45 @@
 #include <iostream>
 #include <iomanip>
-#include <fstream>
 
 #include <TEnv.h>
 
-#include <MSQLServer.h>
-#include <TSQLRow.h>
-#include <TSQLResult.h>
+#include <MSQLMagic.h>
 
 using namespace std;
-
-Bool_t ExistStr(MSQLServer &serv, const char *column, const char *table, const char *test)
-{
-    TString query(Form("SELECT %s FROM %s WHERE %s='%s'", column, table, column, test));
-
-    cout << "query: " << query << endl;
-
-    TSQLResult *res = serv.Query(query);
-    if (!res)
-        return kFALSE;
-
-    Bool_t rc = kFALSE;
-
-    TSQLRow *row=res->Next();
-    if (row && (*row)[0])
-        rc=kTRUE;
-
-    delete res;
-    return rc;
-}
-
 
 int insertdate(TString date)
@@ -80 +56 @@
     TEnv env("sql.rc");
 
-    MSQLServer serv(env);
+    MSQLMagic serv(env);
     if (!serv.IsConnected())
     {
@@ -94 +70 @@
     //insert entry for date into the table SequenceBuildStatus,
     // if entry is not yet existing
-    if (!ExistStr(serv, "fDate", "SequenceBuildStatus", date))
+    if (!serv.ExistStr("fDate", "SequenceBuildStatus", date))
     {
-        TString query(Form("INSERT SequenceBuildStatus SET fDate='%s', fCCFilled=Now() ",
-                           date.Data()));
+        TString vals(Form("fDate='%s', fCCFilled=Now()", date.Data()));
 
-        TSQLResult *res = serv.Query(query);
-        if (!res)
-        {
-            cout << "Error - could not insert entry" << endl;
-            return 0;
-        }
-        delete res;
+        const Int_t rc = serv.Insert("SequenceBuildStatus", vals);
+        if (rc==kFALSE) // Query failed
+            return -1;
+        //if (rc<0)       // Dummy mode
+        //    return 0;
     }
     else
@@ -111 +84 @@
         cout << date << " already exists... do update. " << endl;
 
-        TString query="UPDATE SequenceBuildStatus SET fCCFilled=Now(), fExclusionsDone=NULL, ";
-        query +=Form("fSequenceEntriesBuilt=NULL WHERE fDate='%s' ", date.Data());
+        const Int_t rc = serv.Update("SequenceBuildStatus",
+                                     "fCCFilled=Now(), fExclusionsDone=NULL, fSequenceEntriesBuilt=NULL",
+                                     Form("fDate='%s'", date.Data()));
 
-        TSQLResult *res = serv.Query(query);
-        if (!res)
-        {
-            cout << "Error - could not update entry" << endl;
-            return 0;
-        }
-        delete res;
+        if (rc==kFALSE) // Query failed
+            return -1;
+        //if (rc<0)       // Dummy mode
+        //    return 0;
+
     }