Changeset 7482 for trunk/MagicSoft/Mars/datacenter/macros

Timestamp:

02/07/06 10:53:42 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/macros

Files:

• getdolist.C (modified) (1 diff)
• setstatus.C (modified) (3 diffs)
• setupdb.C (modified) (4 diffs)

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

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

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

@@ -116 +116 @@
 }
 
-Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString statustime, TString failedcode, TString failedcomment, TString starttime, TString failedtime, Bool_t resetall)
+Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString statustime, TString returncode, TString failedcode, TString failedcodeadd, TString starttime, TString failedtime, Bool_t resetall)
 {
-    cout << "set influenes for " << table << "." << column << endl;
+    cout << "set influences for " << table << "." << column << endl;
 
     //build query and set step and influences for the step
     TString influences  = rc.GetValue(table+"."+column+".Influences", "");
 
-    TString query(Form("UPDATE %s SET %s=%s, fFailedCode=%s, fFailedComment=%s, fFailedTime=%s ",
-                       table.Data(), column.Data(), statustime.Data(), failedcode.Data(),
-                       failedcomment.Data(), failedtime.Data()));
+    TString query(Form("UPDATE %s SET %s=%s, fReturnCode=%s, fFailedCode=%s, fFailedCodeAdd=%s, fFailedTime=%s ",
+                       table.Data(), column.Data(), statustime.Data(), returncode.Data(), failedcode.Data(),
+                       failedcodeadd.Data(), failedtime.Data()));
     if (starttime.CompareTo("noreset"))
         query += Form(", fStartTime=%s", starttime.Data());
@@ -163 +163 @@
 }
 
-int setstatus(TString primary, TString table, TString column, TString statustime, TString failedcode, TString failedcomment, TString starttime, TString failedtime, Bool_t resetall=kTRUE)
+int setstatus(TString primary, TString table, TString column, TString statustime, TString returncode, TString failedcode, TString failedcodeadd, TString starttime, TString failedtime, Bool_t resetall=kTRUE)
 {
     TEnv env("sql.rc");
@@ -182 +182 @@
 
     //if reset is needed and/or can be done, set new values
-    return !CheckReset(rc, table, column, statustime) ? 0 : SetInfluences(serv, rc, primary, table, column, statustime, failedcode, failedcomment, starttime, failedtime, resetall);
+    return !CheckReset(rc, table, column, statustime) ? 0 : SetInfluences(serv, rc, primary, table, column, statustime, returncode, failedcode, failedcodeadd, starttime, failedtime, resetall);
 
 }

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

@@ -606 +606 @@
          "  fFailedTime       DATETIME             NULL,"
          "  fFailedCode       SMALLINT UNSIGNED    NULL,"
-         "  fFailedComment    VARCHAR(255)         NULL"
+         "  fReturnCode       SMALLINT UNSIGNED    NULL,"
+         "  fFailedCodeAdd    INT      UNSIGNED    NULL"
          ")";
 
@@ -618 +619 @@
          "  fFailedTime            DATETIME             NULL,"
          "  fFailedCode            SMALLINT UNSIGNED    NULL,"
-         "  fFailedComment         VARCHAR(255)         NULL"
+         "  fReturnCode            SMALLINT UNSIGNED    NULL,"
+         "  fFailedCodeAdd         INT      UNSIGNED    NULL"
          ")";
 
@@ -636 +638 @@
          "  fFailedTime            DATETIME             NULL,"
          "  fFailedCode            SMALLINT UNSIGNED    NULL,"
-         "  fFailedComment         VARCHAR(255)         NULL"
+         "  fReturnCode            SMALLINT UNSIGNED    NULL,"
+         "  fFailedCodeAdd         INT      UNSIGNED    NULL"
          ")";
 
@@ -651 +654 @@
          "  fFailedTime            DATETIME             NULL,"
          "  fFailedCode            SMALLINT UNSIGNED    NULL,"
-         "  fFailedComment         VARCHAR(255)         NULL"
+         "  fReturnCode            SMALLINT UNSIGNED    NULL,"
+         "  fFailedCodeAdd         INT      UNSIGNED    NULL"
          ")";