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

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/dbstatus.php (modified) (2 diffs)

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

@@ -5 +5 @@
         $joins = array
             (
-             "fSourceName"                       => " LEFT JOIN Source                       ON Sequences.fSourceKEY=Source.fSourceKEY ",
+             "fSourceName"                       => " LEFT JOIN Source USING(fSourceKEY) ",
             );
 
@@ -95 +95 @@
         $query0 .= " FROM Sequences ";
 
-        $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 SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) ";
+        $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) ";
+        $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) ";
 
         foreach ($_GET as $key => $element)