Changeset 8797 for trunk/MagicSoft/Mars/datacenter/db

Timestamp:

12/21/07 17:15:19 (17 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• menu.php (modified) (3 diffs)
• runinfo-aio.php (modified) (2 diffs)
• sequinfo-aio.php (modified) (1 diff)

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

@@ -25 +25 @@
     CheckBox("fMeanTriggerRate",  "Mean Trigger rate");
     CheckBox("fSequenceFirst",    "Sequence Number");
+
+    printf("  </tr><tr>\n");
+
     CheckBox("fTest",             "incl. TestSources");
+    CheckBox("fLinks",            "Links");
 
     printf("  </tr>\n");
@@ -282 +286 @@
     CheckBox("fUnsuitable50",        "Unsuitable (50%)");
     CheckBox("fUnsuitable01",        "Unsuitable (1%)");
-    CheckBox("fUnsuitableMax",       "Unsuitable (99.9%)");
+    CheckBox("fUnsuitableMax",       "UnsuitableMax");
     CheckBox("fDeadMax",             "DeadMax");
 
@@ -680 +684 @@
     InitFailInfo($_GET, $first);
 
+    if (empty($_GET["fLinks"]))
+        $_GET["fLinks"]=$first?"On":"";
+
     if (empty($_GET["fFormatVersion"]))
         $_GET["fFormatVersion"]="Off";

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

@@ -50 +50 @@
                 $query0 .= " RunData.fRunNumber as 'Run#' ";
 
+                if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"]))
+                {
+                    $query0 .= ", CONCAT('<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&amp;fDate=2\">rbk</A>') ";
+                    $query0 .= " as 'Links'";
+                }
+
                 foreach ($_GET as $key => $element)
-                    if ($_GET[$key]=="On" && $key!="fTest")
+                    if ($key!="fLinks" && $_GET[$key]=="On" && $key!="fTest")
                         if (empty($checkwhere[$key]) || $checkwhere[$key]==0)
                             $query0 .= ", " . $key . " as '" . $alias[$key] . "' ";
@@ -177 +183 @@
                 $query0 .= "DESC";
         }
+        else
+            $query0 .=" ORDER BY RunData.fRunNumber DESC";
 
         if (empty($_GET["fNumStart"]))

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

@@ -60 +60 @@
                         $query0 .= ", '&nbsp;<A&ws;HREF=\"http://www.astro.uni-wuerzburg.de/datacenter/star/' , LEFT(LPAD(CONCAT(Sequences.fSequenceFirst, '.'), 9,'0'),4), '/', LPAD(CONCAT(Sequences.fSequenceFirst, '/'), 9,'0'), '\">s</A>'";
                         $query0 .= ", '&nbsp;<A&ws;HREF=\"http://www.astro.uni-wuerzburg.de/datacenter/sequences/' , LEFT(LPAD(CONCAT(Sequences.fSequenceFirst, '.'), 9,'0'),4), '/sequence', LPAD(CONCAT(Sequences.fSequenceFirst , '.txt'), 12,'0') , '\">', 'f </A>' ";
-                        $query0 .= ", '&nbsp;<A&ws;HREF=\"sequence.php?fSequenceNo=', Sequences.fSequenceFirst , '&amp;fAll=On\">i</A>') ";
+                        $query0 .= ", '&nbsp;<A&ws;HREF=\"sequence.php?fSequenceNo=', Sequences.fSequenceFirst , '&amp;fAll=On\">i</A>'";
+                        $query0 .= ", '&nbsp;<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&amp;fDate=2\">rbk</A>') ";
                         $query0 .= " as 'Links'";
                     }