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

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

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

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

@@ -72 +72 @@
         $query0 .= " FROM " . $fromtable;
 
-        $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)
@@ -87 +87 @@
         {
             if ($_GET["fSourceName"]!="On")
-                $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
+                $query0 .= " LEFT JOIN Source ON USING(fSourceKEY) ";
             $query0 .= " WHERE fTest='no'";
         }