Changeset 9105 for trunk/MagicSoft/Mars/datacenter/db/sequence.php

Timestamp:

08/06/08 16:13:23 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

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

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

@@ -38 +38 @@
         $query0 .= " FROM Sequences ";
 
-        $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
-        $query0 .= " LEFT JOIN Project ON Sequences.fProjectKEY=Project.fProjectKEY ";
-        $query0 .= " LEFT JOIN HvSettings ON Sequences.fHvSettingsKEY=HvSettings.fHvSettingsKEY ";
-        $query0 .= " LEFT JOIN DiscriminatorThresholdTable ON Sequences.fDiscriminatorThresholdTableKEY=DiscriminatorThresholdTable.fDiscriminatorThresholdTableKEY ";
-        $query0 .= " LEFT JOIN L1TriggerTable ON Sequences.fL1TriggerTableKEY=L1TriggerTable.fL1TriggerTableKEY ";
-        $query0 .= " LEFT JOIN L2TriggerTable ON Sequences.fL2TriggerTableKEY=L2TriggerTable.fL2TriggerTableKEY ";
-        $query0 .= " LEFT JOIN TriggerDelayTable ON Sequences.fTriggerDelayTableKEY=TriggerDelayTable.fTriggerDelayTableKEY ";
-        $query0 .= " LEFT JOIN TestFlag ON Sequences.fTestFlagKEY=TestFlag.fTestFlagKEY ";
-        $query0 .= " LEFT JOIN LightConditions ON Sequences.fLightConditionsKEY=LightConditions.fLightConditionsKEY ";
-        $query0 .= " LEFT JOIN ManuallyChanged ON Sequences.fManuallyChangedKEY=ManuallyChanged.fManuallyChangedKEY ";
-        $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst ";
-        $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst ";
-        $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst ";
+        $query0 .= " LEFT JOIN Source USING(fSourceKEY) ";
+        $query0 .= " LEFT JOIN Project USING(fProjectKEY) ";
+        $query0 .= " LEFT JOIN HvSettings USING(fHvSettingsKEY) ";
+        $query0 .= " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ";
+        $query0 .= " LEFT JOIN L1TriggerTable USING(fL1TriggerTableKEY) ";
+        $query0 .= " LEFT JOIN L2TriggerTable USING(fL2TriggerTableKEY) ";
+        $query0 .= " LEFT JOIN TriggerDelayTable USING(fTriggerDelayTableKEY) ";
+        $query0 .= " LEFT JOIN TestFlag USING(fTestFlagKEY) ";
+        $query0 .= " LEFT JOIN LightConditions USING(fLightConditionsKEY) ";
+        $query0 .= " LEFT JOIN ManuallyChanged USING(fManuallyChangedKEY) ";
+        $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) ";
+        $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) ";
+        $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) ";
 
 
@@ -171 +171 @@
     {
         $query1  = "SELECT fRunNumber, fCalibrationScriptName FROM RunData ";
-        $query1 .= " LEFT JOIN RunType ON RunData.fRunTypeKEY=RunType.fRunTypeKEY ";
-        $query1 .= " LEFT JOIN CalibrationScript ON RunData.fCalibrationScriptKEY=CalibrationScript.fCalibrationScriptKEY ";
+        $query1 .= " LEFT JOIN RunType USING(fRunTypeKEY) ";
+        $query1 .= " LEFT JOIN CalibrationScript USING(fCalibrationScriptKEY) ";
         $query1 .= " WHERE fSequenceFirst=" . $sequ . " AND fRunTypeName='" . $type . "'";
 
@@ -195 +195 @@
     {
         $query2  = "SELECT RunData.fRunNumber FROM RunData ";
-        $query2 .= " LEFT JOIN RunProcessStatus ON RunData.fRunNumber=RunProcessStatus.fRunNumber ";
+        $query2 .= " LEFT JOIN RunProcessStatus USING(fRunNumber,fTelescopeNumber,fFileNumber) ";
         $query2 .= " WHERE fSequenceFirst=" . $sequ . " AND IsNull(" . $column . ")";