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

Timestamp:

08/06/08 16:52:46 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

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

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

@@ -156 +156 @@
      "fFormatVersion"                   => "F-Ver",
      "fLastUpdate"                      => "LastUpd",
-     "fRunNumber"                       => "Run#",
+//     "fRunNumber"                       => "Run#",
+     "Run#"                       => "Run#",
+     "Tel:Run:File"                       => "Tel:Run:File",
      "fRunTypeName"                     => "RunType",
      "fMeanTriggerRate"                 => "Rate<br>[Hz]",
@@ -668 +670 @@
     if (!empty($tables[$val]))
         $table=$tables[$val];
+    if ($val=="Tel:Run:File")
+        $table="'Tel:Run:File'";
+    if ($val=="Tel:Sequ")
+        $table="'Tel:Sequ'";
     if ($val=="NumRuns")
         $table="'# Runs'";
@@ -686 +692 @@
     $joins = array
         (
-         "fRunTypeName"                      => " LEFT JOIN RunType                      ON " . $fromtable . ".fRunTypeKEY=RunType.fRunTypeKEY ",
-         "fProjectName"                      => " LEFT JOIN Project                      ON " . $fromtable . ".fProjectKEY=Project.fProjectKEY ",
-         "fSourceName"                       => " LEFT JOIN Source                       ON " . $fromtable . ".fSourceKEY=Source.fSourceKEY ",
-         "fMagicNumberName"                  => " LEFT JOIN MagicNumber                  ON " . $fromtable . ".fMagicNumberKEY=MagicNumber.fMagicNumberKEY ",
-         "fL1TriggerTableName"               => " LEFT JOIN L1TriggerTable               ON " . $fromtable . ".fL1TriggerTableKEY=L1TriggerTable.fL1TriggerTableKEY",
-         "fL2TriggerTableName"               => " LEFT JOIN L2TriggerTable               ON " . $fromtable . ".fL2TriggerTableKEY=L2TriggerTable.fL2TriggerTableKEY",
-         "fHvSettingsName"                   => " LEFT JOIN HvSettings                   ON " . $fromtable . ".fHvSettingsKEY=HvSettings.fHvSettingsKEY",
-         "fCalibrationScriptName"            => " LEFT JOIN CalibrationScript            ON " . $fromtable . ".fCalibrationScriptKEY=CalibrationScript.fCalibrationScriptKEY",
-         "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 ",
-         "fTestFlagName"                     => " LEFT JOIN TestFlag                     ON " . $fromtable . ".fTestFlagKEY=TestFlag.fTestFlagKEY",
-         "fLightConditionsName"              => " LEFT JOIN LightConditions              ON " . $fromtable . ".fLightConditionsKEY=LightConditions.fLightConditionsKEY",
-         "fParticleTypeName"                 => " LEFT JOIN ParticleType                 ON " . $fromtable . ".fParticleTypeKEY=ParticleType.fParticleTypeKEY ",
-         "fFitsFileName"                     => " LEFT JOIN FitsFile                     ON " . $fromtable . ".fFitsFileKEY=FitsFile.fFitsFileKEY",
-         "fObjectName"                       => " LEFT JOIN Object                       ON " . $fromtable . ".fObjectKEY=Object.fObjectKEY ",
-         "fStatusName"                       => " LEFT JOIN Status                       ON " . $fromtable . ".fStatusKEY=Status.fStatusKEY ",
-         "fBandName"                         => " LEFT JOIN Band                         ON " . $fromtable . ".fBandKEY=Band.fBandKEY ",
-         "fUserName"                         => " LEFT JOIN User                         ON " . $fromtable . ".fUserKEY=User.fUserKEY ",
-         "fTelescopeName"                    => " LEFT JOIN Telescope                    ON " . $fromtable . ".fTelescopeKEY=Telescope.fTelescopeKEY ",
+         "fRunTypeName"                     => " LEFT JOIN RunType                     USING(fRunTypeKEY) ",
+         "fProjectName"                     => " LEFT JOIN Project                     USING(fProjectKEY) ",
+         "fSourceName"                      => " LEFT JOIN Source                      USING(fSourceKEY) ",
+         "fMagicNumberName"                 => " LEFT JOIN MagicNumber                 USING(fMagicNumberKEY) ",
+         "fL1TriggerTableName"              => " LEFT JOIN L1TriggerTable              USING(fL1TriggerTableKEY) ",
+         "fL2TriggerTableName"              => " LEFT JOIN L2TriggerTable              USING(fL2TriggerTableKEY) ",
+         "fHvSettingsName"                  => " LEFT JOIN HvSettings                  USING(fHvSettingsKEY) ",
+         "fCalibrationScriptName"           => " LEFT JOIN CalibrationScript           USING(fCalibrationScriptKEY) ",
+         "fExcludedFDAName"                 => " LEFT JOIN ExcludedFDA                 USING(fExcludedFDAKEY) ",
+         "fManuallyChangedName"             => " LEFT JOIN ManuallyChanged             USING(fManuallyChangedKEY) ",
+         "fObservationModeName"             => " LEFT JOIN ObservationMode             USING(fObservationModeKEY) ",
+         "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ",
+         "fTriggerDelayTableName"           => " LEFT JOIN TriggerDelayTable           USING(fTriggerDelayTableKEY) ",
+         "fTestFlagName"                    => " LEFT JOIN TestFlag                    USING(fTestFlagKEY) ",
+         "fLightConditionsName"             => " LEFT JOIN LightConditions             USING(fLightConditionsKEY) ",
+         "fParticleTypeName"                => " LEFT JOIN ParticleType                USING(fParticleTypeKEY) ",
+         "fFitsFileName"                    => " LEFT JOIN FitsFile                    USING(fFitsFileKEY) ",
+         "fObjectName"                      => " LEFT JOIN Object                      USING(fObjectKEY) ",
+         "fStatusName"                      => " LEFT JOIN Status                      USING(fStatusKEY) ",
+         "fBandName"                        => " LEFT JOIN Band                        USING(fBandKEY) ",
+         "fUserName"                        => " LEFT JOIN User                        USING(fUserKEY) ",
+         "fTelescopeName"                   => " LEFT JOIN Telescope                   USING(fTelescopeKEY) ",
         );