Changeset 8797


Ignore:
Timestamp:
Dec 21, 2007, 5:15:19 PM (13 years ago)
Author:
dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8796 r8797  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2007/12/21 Daniela Dorner
     22
     23   * datacenter/db/sequinfo-aio.php, datacenter/db/menu.php,
     24     datacenter/db/runinfo-aio.php:
     25     - implemented link to runbook of the according night
     26
     27
    2028
    2129 2007/12/20 Thomas Bretz
  • trunk/MagicSoft/Mars/datacenter/db/menu.php

    r8791 r8797  
    2525    CheckBox("fMeanTriggerRate",  "Mean Trigger rate");
    2626    CheckBox("fSequenceFirst",    "Sequence Number");
     27
     28    printf("  </tr><tr>\n");
     29
    2730    CheckBox("fTest",             "incl. TestSources");
     31    CheckBox("fLinks",            "Links");
    2832
    2933    printf("  </tr>\n");
     
    282286    CheckBox("fUnsuitable50",        "Unsuitable (50%)");
    283287    CheckBox("fUnsuitable01",        "Unsuitable (1%)");
    284     CheckBox("fUnsuitableMax",       "Unsuitable (99.9%)");
     288    CheckBox("fUnsuitableMax",       "UnsuitableMax");
    285289    CheckBox("fDeadMax",             "DeadMax");
    286290
     
    680684    InitFailInfo($_GET, $first);
    681685
     686    if (empty($_GET["fLinks"]))
     687        $_GET["fLinks"]=$first?"On":"";
     688
    682689    if (empty($_GET["fFormatVersion"]))
    683690        $_GET["fFormatVersion"]="Off";
  • trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

    r8768 r8797  
    5050                $query0 .= " RunData.fRunNumber as 'Run#' ";
    5151
     52                if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"]))
     53                {
     54                    $query0 .= ", CONCAT('<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&amp;fDate=2\">rbk</A>') ";
     55                    $query0 .= " as 'Links'";
     56                }
     57
    5258                foreach ($_GET as $key => $element)
    53                     if ($_GET[$key]=="On" && $key!="fTest")
     59                    if ($key!="fLinks" && $_GET[$key]=="On" && $key!="fTest")
    5460                        if (empty($checkwhere[$key]) || $checkwhere[$key]==0)
    5561                            $query0 .= ", " . $key . " as '" . $alias[$key] . "' ";
     
    177183                $query0 .= "DESC";
    178184        }
     185        else
     186            $query0 .=" ORDER BY RunData.fRunNumber DESC";
    179187
    180188        if (empty($_GET["fNumStart"]))
  • trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php

    r8792 r8797  
    6060                        $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>'";
    6161                        $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>' ";
    62                         $query0 .= ", '&nbsp;<A&ws;HREF=\"sequence.php?fSequenceNo=', Sequences.fSequenceFirst , '&amp;fAll=On\">i</A>') ";
     62                        $query0 .= ", '&nbsp;<A&ws;HREF=\"sequence.php?fSequenceNo=', Sequences.fSequenceFirst , '&amp;fAll=On\">i</A>'";
     63                        $query0 .= ", '&nbsp;<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&amp;fDate=2\">rbk</A>') ";
    6364                        $query0 .= " as 'Links'";
    6465                    }
Note: See TracChangeset for help on using the changeset viewer.