Changeset 9111


Ignore:
Timestamp:
08/07/08 20:00:19 (16 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9110 r9111  
    2727     - added dataset number to output
    2828
     29   * datacenter/db/runinfo-aio.php, datacenter/db/sequinfo-aio.php
     30     datacenter/db/magicdefs.php:
     31     - improved sorting with combination of (file-,) run/sequ- and
     32       telescope number
     33
    2934
    3035
     
    6873     - implemented telescope number
    6974
    70    * datacenter/db/runinfo-aio.php,:
     75   * datacenter/db/runinfo-aio.php:
    7176     - moved pulldown for number of results
    7277
    73    * datacenter/db/resetseq.php,:
     78   * datacenter/db/resetseq.php:
    7479     - removed unknown ip adresses, added names to known ip adresses
    7580
  • trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

    r9106 r9111  
    670670    if (!empty($tables[$val]))
    671671        $table=$tables[$val];
    672     if ($val=="Tel:Run:File")
    673         $table="'Tel:Run:File'";
     672    if ($val=="Tel:Run/File")
     673        $table="'Tel:Run/File'";
    674674    if ($val=="Tel:Sequ")
    675675        $table="'Tel:Sequ'";
  • trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

    r9105 r9111  
    5050//                $query0 .= " RunData.fRunNumber as 'Run#' ";
    5151//                $query0 .= " Concat(RunData.fTelescopeNumber,':', RunData.fRunNumber,':', RunData.fFileNumber) as 'Run' ";
    52                 $query0 .= " Concat(RunData.fTelescopeNumber,':', RunData.fRunNumber,':', RunData.fFileNumber) as 'Tel:Run:File' ";
     52                $query0 .= " Concat('M', RunData.fTelescopeNumber,':', LPAD(RunData.fRunNumber,8, ' '),'/', LPAD(RunData.fFileNumber, 3, ' ')) as 'Tel:Run/File' ";
    5353
    5454                if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"]))
  • trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php

    r9105 r9111  
    5151                    //$query0 .= " CONCAT('<A&ws;HREF=\"runinfo-aio.php?',  'fRunStart=On', '&amp;fZenithDistance=On', '&amp;fRunMin=', Sequences.fSequenceFirst, '&amp;fMeanTriggerRate=On', '&amp;fTest=On', '&amp;fRunTypeName=On', '&amp;fRunMax=', fSequenceLast, '&amp;fNumEvents=On', '&amp;fSourceName=On&amp;', 'fExcludedFDAKEY=1', '&amp;fSequenceFirst=On', '&amp;fRawFileAvail=On', '&amp;fCCFileAvail=On', '&amp;fCaCoFileAvail=On', '&amp;fNumResults=500\">', Sequences.fSequenceFirst, '</A>') ";
    5252                    //new version using fSequenceNo
    53                     $query0 .= " CONCAT('<A&ws;HREF=\"runinfo-aio.php?',  'fRunStart=On', '&amp;fZenithDistance=On', '&amp;fSequenceNo=', Sequences.fSequenceFirst, '&amp;fMeanTriggerRate=On', '&amp;fTest=On', '&amp;fRunTypeName=On', '&amp;fNumEvents=On', '&amp;fSourceName=On&amp;', 'fExcludedFDAKEY=1', '&amp;fSequenceFirst=On', '&amp;fRawFileAvail=On', '&amp;fCCFileAvail=On', '&amp;fCaCoFileAvail=On', '&amp;fNumResults=500\">', Sequences.fTelescopeNumber, ':', Sequences.fSequenceFirst, '</A>') ";
     53                    $query0 .= " CONCAT('<A&ws;HREF=\"runinfo-aio.php?',  'fRunStart=On', '&amp;fZenithDistance=On', '&amp;fSequenceNo=', Sequences.fSequenceFirst, '&amp;fMeanTriggerRate=On', '&amp;fTest=On', '&amp;fRunTypeName=On', '&amp;fNumEvents=On', '&amp;fSourceName=On&amp;', 'fExcludedFDAKEY=1', '&amp;fSequenceFirst=On', '&amp;fRawFileAvail=On', '&amp;fCCFileAvail=On', '&amp;fCaCoFileAvail=On', '&amp;fNumResults=500\">', 'M', Sequences.fTelescopeNumber, ':', LPAD(Sequences.fSequenceFirst, 8, ' '), '</A>') ";
    5454//                    $query0 .= " as " . $alias["fSequenceFirst"];
    5555                    $query0 .= " as 'Tel:Sequ'";
Note: See TracChangeset for help on using the changeset viewer.