Changeset 9111 for trunk/MagicSoft

Timestamp:

08/07/08 20:00:19 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• datacenter/db/magicdefs.php (modified) (1 diff)
• datacenter/db/runinfo-aio.php (modified) (1 diff)
• datacenter/db/sequinfo-aio.php (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - added dataset number to output
 
+   * datacenter/db/runinfo-aio.php, datacenter/db/sequinfo-aio.php
+     datacenter/db/magicdefs.php:
+     - improved sorting with combination of (file-,) run/sequ- and 
+       telescope number
+
 
 
@@ -68 +73 @@
      - implemented telescope number
 
-   * datacenter/db/runinfo-aio.php,:
+   * datacenter/db/runinfo-aio.php:
      - moved pulldown for number of results
 
-   * datacenter/db/resetseq.php,:
+   * datacenter/db/resetseq.php:
      - removed unknown ip adresses, added names to known ip adresses
 

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

@@ -670 +670 @@
     if (!empty($tables[$val]))
         $table=$tables[$val];
-    if ($val=="Tel:Run:File")
-        $table="'Tel:Run:File'";
+    if ($val=="Tel:Run/File")
+        $table="'Tel:Run/File'";
     if ($val=="Tel:Sequ")
         $table="'Tel:Sequ'";

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

@@ -50 +50 @@
 //                $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' ";
+                $query0 .= " Concat('M', RunData.fTelescopeNumber,':', LPAD(RunData.fRunNumber,8, ' '),'/', LPAD(RunData.fFileNumber, 3, ' ')) as 'Tel:Run/File' ";
 
                 if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"]))

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

@@ -51 +51 @@
                     //$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>') ";
                     //new version using fSequenceNo
-                    $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>') ";
+                    $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>') ";
 //                    $query0 .= " as " . $alias["fSequenceFirst"];
                     $query0 .= " as 'Tel:Sequ'";