Changeset 8119 for trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

Timestamp:

10/18/06 14:51:53 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (modified) (6 diffs)

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

@@ -70 +70 @@
      "fExcludedFDAName"                  => CheckWhere("fExcludedFDAKEY",                  $_GET),
      "fManuallyChangedName"              => CheckWhere("fManuallyChangedKEY",              $_GET),
+     "fObservationModeName"              => CheckWhere("fObservationModeKEY",              $_GET),
      "fDiscriminatorThresholdTableName"  => CheckWhere("fDiscriminatorThresholdTableKEY",  $_GET),
      "fTriggerDelayTableName"            => CheckWhere("fTriggerDelayTableKEY",            $_GET),
@@ -89 +90 @@
      "fExcludedFDAName"                  => CheckGroup("fExcludedFDAKEY",                  $_GET),
      "fManuallyChangedName"              => CheckGroup("fManuallyChangedKEY",              $_GET),
+     "fObservationModeName"              => CheckGroup("fObservationModeKEY",              $_GET),
      "fDiscriminatorThresholdTableName"  => CheckGroup("fDiscriminatorThresholdTableKEY",  $_GET),
      "fTriggerDelayTableName"            => CheckGroup("fTriggerDelayTableKEY",            $_GET),
@@ -146 +148 @@
      "fL2RateUnpresc"                   => "L2<br>upRate<br>[Hz]",
      "fManuallyChangedName"             => "Manually<br>Changed",
+     "fObservationModeName"             => "Obs.<br>Mode",
      "fLastUpdate"                      => "LastUpd",
      "fSequenceFirst"                   => "Sequ",
@@ -404 +407 @@
          "fExcludedFDAName"                  => $fromtable . ".fExcludedFDAKEY",
          "fManuallyChangedName"              => $fromtable . ".fManuallyChangedKEY",
+         "fObservationModeName"              => $fromtable . ".fObservationModeKEY",
          "fDiscriminatorThresholdTableName"  => $fromtable . ".fDiscriminatorThresholdTableKEY",
          "fTriggerDelayTableName"            => $fromtable . ".fTriggerDelayTableKEY",
@@ -452 +456 @@
          "fHvSettingsName"                   => "HvSettings.fHvSettingsName",
          "fManuallyChangedName"              => "ManuallyChanged.fManuallyChangedName",
+         "fObservationModeName"              => "ObservationMode.fObservationModeName",
          "fTriggerDelayTableName"            => "TriggerDelayTable.fTriggerDelayTableName",
          "fDiscriminatorThresholdTableName"  => "DiscriminatorThresholdTable.fDiscriminatorThesholdTableName",
@@ -576 +581 @@
          "fExcludedFDAName"                  => " LEFT JOIN ExcludedFDA                  ON " . $fromtable . ".fExcludedFDAKEY=ExcludedFDA.fExcludedFDAKEY",
          "fManuallyChangedName"              => " LEFT JOIN ManuallyChanged              ON " . $fromtable . ".fManuallyChangedKEY=ManuallyChanged.fManuallyChangedKEY ",
+         "fObservationModeName"              => " LEFT JOIN ObservationMode              ON " . $fromtable . ".fObservationModeKEY=ObservationMode.fObservationModeKEY ",
          "fDiscriminatorThresholdTableName"  => " LEFT JOIN DiscriminatorThresholdTable  ON " . $fromtable . ".fDiscriminatorThresholdTableKEY=DiscriminatorThresholdTable.fDiscriminatorThresholdTableKEY ",
          "fTriggerDelayTableName"            => " LEFT JOIN TriggerDelayTable            ON " . $fromtable . ".fTriggerDelayTableKEY=TriggerDelayTable.fTriggerDelayTableKEY ",