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

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (modified) (4 diffs)

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

@@ -68 +68 @@
         $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)
@@ -79 +79 @@
         {
             if ($_GET["fSourceName"]!="On")
-                $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
+                $query0 .= " LEFT JOIN Source USING(fSourceKEY) ";
             $query0 .= " WHERE fTest='no'";
         }
@@ -479 +479 @@
                         $query.=", " . $name;
                     $query.=" FROM Sequences ";
-                    $query.=" LEFT JOIN Calibration ON Calibration.fSequenceFirst=Sequences.fSequenceFirst ";
-                    $query.=" LEFT JOIN Star ON Star.fSequenceFirst=Sequences.fSequenceFirst ";
+                    $query.=" LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) ";
+                    $query.=" LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) ";
                     $query.=" WHERE Sequences.fSequenceFirst IN (" . $sequences . ")";
                     $result = mysql_query($query, $db_id);
@@ -501 +501 @@
                 function GetSources($db_id, $sequences)
                 {
-                    $query="SELECT fSourceName FROM Source LEFT JOIN Sequences ON Sequences.fSourceKEY=Source.fSourceKEY ";
+                    $query="SELECT fSourceName FROM Source LEFT JOIN Sequences USING(fSourceKEY) ";
                     $query.="WHERE fSequenceFirst IN (" . $sequences . ") GROUP BY fSourceName";
                     $result = mysql_query($query, $db_id);