Changeset 9105 for trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php (modified) (5 diffs)

trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

@@ -48 +48 @@
             else
             {
-                $query0 .= " RunData.fRunNumber as 'Run#' ";
+//                $query0 .= " RunData.fRunNumber as 'Run#' ";
+//                $query0 .= " Concat(RunData.fTelescopeNumber,':', RunData.fRunNumber,':', RunData.fFileNumber) as 'Run' ";
+                $query0 .= " Concat(RunData.fTelescopeNumber,':', RunData.fRunNumber,':', RunData.fFileNumber) as 'Tel:Run:File' ";
 
                 if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"]))
@@ -65 +67 @@
         $query0 .= " FROM RunData ";
 
-        $query0 .= " LEFT JOIN RunProcessStatus ON RunData.fRunNumber=RunProcessStatus.fRunNumber ";
+        $query0 .= " LEFT JOIN RunProcessStatus USING(fRunNumber,fTelescopeNumber,fFileNumber) ";
 
         foreach ($_GET as $key => $element)
@@ -74 +76 @@
         {
             if ($_GET["fSourceName"]!="On")
-                $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ";
+                $query0 .= " LEFT JOIN Source USING(fSourceKEY) ";
             $query0 .= " WHERE fTest='no'";
         }
@@ -262 +264 @@
         printf(" <P>\n");
         PrintSourceMenu($host,$user,$pw,$db);
-        PrintNumResPullDown();
         printf("<p>");
         printf("</div>");
@@ -271 +272 @@
         ini_set("display_errors", "Off");
 
+        PrintNumResPullDown();
         PrintButtons("runinfo-aio.php");