Changeset 9194 for trunk/MagicSoft/Mars/datacenter/db

Timestamp:

12/19/08 15:56:10 (16 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• magicdefs.php (modified) (6 diffs)
• menu.php (modified) (4 diffs)

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -74 +74 @@
      "fManuallyChangedName"              => CheckWhere("fManuallyChangedKEY",              $_GET),
      "fObservationModeName"              => CheckWhere("fObservationModeKEY",              $_GET),
+     "fSumTriggerFlagName"               => CheckWhere("fSumTriggerFlagKEY",               $_GET),
      "fDiscriminatorThresholdTableName"  => CheckWhere("fDiscriminatorThresholdTableKEY",  $_GET),
      "fTriggerDelayTableName"            => CheckWhere("fTriggerDelayTableKEY",            $_GET),
@@ -100 +101 @@
      "fManuallyChangedName"              => CheckGroup("fManuallyChangedKEY",              $_GET),
      "fObservationModeName"              => CheckGroup("fObservationModeKEY",              $_GET),
+     "fSumTriggerFlagName"               => CheckGroup("fSumTriggerFlagKEY",              $_GET),
      "fDiscriminatorThresholdTableName"  => CheckGroup("fDiscriminatorThresholdTableKEY",  $_GET),
      "fTriggerDelayTableName"            => CheckGroup("fTriggerDelayTableKEY",            $_GET),
@@ -167 +169 @@
      "fManuallyChangedName"             => "Manually<br>Changed",
      "fObservationModeName"             => "Obs.<br>Mode",
+     "fSumTriggerFlagName"              => "SumTrigger<br>Flag",
      "fLastUpdate"                      => "LastUpd",
      "fSequenceFirst"                   => "Sequ",
@@ -483 +486 @@
          "fManuallyChangedName"              => $fromtable . ".fManuallyChangedKEY",
          "fObservationModeName"              => $fromtable . ".fObservationModeKEY",
+         "fSumTriggerFlagName"               => $fromtable . ".fSumTriggerFlagKEY",
          "fDiscriminatorThresholdTableName"  => $fromtable . ".fDiscriminatorThresholdTableKEY",
          "fTriggerDelayTableName"            => $fromtable . ".fTriggerDelayTableKEY",
@@ -538 +542 @@
          "fManuallyChangedName"              => "ManuallyChanged.fManuallyChangedName",
          "fObservationModeName"              => "ObservationMode.fObservationModeName",
+         "fSumTriggerFlagName"               => "SumTriggerFlag.fSumTriggerFlagName",
          "fTriggerDelayTableName"            => "TriggerDelayTable.fTriggerDelayTableName",
          "fDiscriminatorThresholdTableName"  => "DiscriminatorThresholdTable.fDiscriminatorThesholdTableName",
@@ -703 +708 @@
          "fManuallyChangedName"             => " LEFT JOIN ManuallyChanged             USING(fManuallyChangedKEY) ",
          "fObservationModeName"             => " LEFT JOIN ObservationMode             USING(fObservationModeKEY) ",
+         "fSumTriggerFlagName"              => " LEFT JOIN SumTriggerFlag              USING(fSumTriggerFlagKEY) ",
          "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ",
          "fTriggerDelayTableName"           => " LEFT JOIN TriggerDelayTable           USING(fTriggerDelayTableKEY) ",

trunk/MagicSoft/Mars/datacenter/db/menu.php

@@ -93 +93 @@
     printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "ObservationMode",   "fObservationModeName", "fObservationModeKEY", "Obs. Mode");
+    printf("  </td><td>\n");
+    printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag",   "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag");
     printf(" </td></tr></table>\n");
     printf(" </div><p>\n");
@@ -155 +158 @@
     printf("  </td><td>\n");
     PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable",           "fTriggerDelayTableName",           "fTriggerDelayTableKEY",           "Trigger Delay Table");
+    printf("  </td></tr><tr><td>\n");
+    printf("  </td><td>\n");
+    printf("  </td><td>\n");
+    PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag",              "fSumTriggerFlag",                  "fSumTriggerFlagKEY",              "SumTrigger Flag");
 //    printf("  </td><td>\n");
 //    PrintPullDown($host, $user, $pw, $db, "ManuallyChanged",             "fManuallyChangedName",             "fManuallyChangedKEY",             "Manually changed");
@@ -731 +738 @@
         $_GET["fObservationModeName"]="Off";
 
+    if (empty($_GET["fSumTriggerFlagName"]))
+        $_GET["fSumTriggerFlagName"]="Off";
+
     if (empty($_GET["fMeanTriggerRate"]))
         $_GET["fMeanTriggerRate"]="Off";
@@ -995 +1005 @@
         $_GET["fObservationModeName"]="Off";
 
+    if (empty($_GET["fSumTriggerFlagName"]))
+        $_GET["fSumTriggerFlagName"]="Off";
+
 //    if (empty($_GET["fManuallyChangedName"]))
 //        $_GET["fManuallyChangedName"]="Off";