Changeset 7464 for trunk/MagicSoft/Mars

Timestamp:

01/30/06 17:03:05 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/getdolist.C (modified) (1 diff)
• datacenter/macros/setstatus.C (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/01/30 Daniela Dorner
+
+   * datacenter/macros/setstatus.C, getdolist.C: 
+     - adapted macros to the improvement of failure handling in the 
+       automatic analysis (added columns fFailed, fStartTime, 
+       fFailedTime)
+
+
 
  2006/01/27 Thomas Bretz

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

@@ -130 +130 @@
                     rc.GetValue(table+".TimerTable", ""),
                     rc.GetValue(table+".Primary", ""));
-    query+=Form(" WHERE ISNULL(%s)", column.Data());
+    query+=Form(" WHERE ISNULL(%s) AND ISNULL(fFailed) AND ISNULL(fStartTime) AND ISNULL(fFailedTime) ", column.Data());
 
     TIter Next(&l);

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

@@ -33 +33 @@
 //
 // Usage:
-//   .x setstatus.C+("primary","table","column","value",kTRUE)
+//  .x setstatus.C+("primary","table","column","statustime","failed","starttime","failedtime",kTRUE)
 // The first argument is the primary (date/run/sequence/dataset), the second
 // and third argument give the table and column of the step. The fourth
-// column is giving the value, to which the column has to be set. The last
-// argument is indicating if the columns of all influenced steps shall be
-// reset to NULL. The default is kTRUE, which means, that the columns are
-// reset.
+// column is giving the statustime, to which the column has to be set. The
+// fifth argument is giving the error code (in case of failure), the sixth
+// the starttime and the seventh the stoptime (only in case of failure).
+// The last argument is indicating if the columns of all influenced steps
+// shall be reset to NULL. The default is kTRUE, which means, that the
+// columns are reset.
 //
 // Make sure, that database and password are corretly set in a resource
@@ -63 +65 @@
 
 
-Bool_t CheckReset(TEnv &rc, TString table, TString column, TString value)
+Bool_t CheckReset(TEnv &rc, TString table, TString column, TString statustime)
 {
-    if (value!="NULL")
+    if (statustime!="NULL")
     {
         cout << "everything ok - no reset needed" << endl;
@@ -113 +115 @@
 }
 
-Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString value, Bool_t resetall)
+Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString statustime, TString failed, TString starttime, TString failedtime, Bool_t resetall)
 {
     cout << "set influenes for " << table << "." << column << endl;
@@ -120 +122 @@
     TString influences  = rc.GetValue(table+"."+column+".Influences", "");
 
-    TString query(Form("UPDATE %s SET %s=%s",
-                       table.Data(), column.Data(), value.Data()));
+    TString query(Form("UPDATE %s SET %s=%s, fFailed=%s, fStartTime=%s, fFailedTime=%s ",
+                       table.Data(), column.Data(), statustime.Data(), failed.Data(),
+                       starttime.Data(), failedtime.Data()));
 
     while (!influences.IsNull() && resetall)
@@ -157 +160 @@
 }
 
-int setstatus(TString primary, TString table, TString column, TString value, Bool_t resetall=kTRUE)
+int setstatus(TString primary, TString table, TString column, TString statustime, TString failed, TString starttime, TString failedtime, Bool_t resetall=kTRUE)
 {
     TEnv env("sql.rc");
@@ -176 +179 @@
 
     //if reset is needed and/or can be done, set new values
-    return !CheckReset(rc, table, column, value) ? 0 : SetInfluences(serv, rc, primary, table, column, value, resetall);
+    return !CheckReset(rc, table, column, statustime) ? 0 : SetInfluences(serv, rc, primary, table, column, statustime, failed, starttime, failedtime, resetall);
 
 }