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

Timestamp:

07/05/10 18:36:42 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• mcdefs.php (modified) (2 diffs)
• mcinfo.php (modified) (3 diffs)

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

@@ -51 +51 @@
      "Callisto"                 => "Callisto",
      "Star"                     => "Star",
-     "fStartTime"               => "Process",
-     "fFailedTime"              => "Failed",
-     "fReturnCode"              => "Ret<br>Code",
-     "fProgramId"               => "Prgr<br>Id",
      "fZenithDistanceMin"       => "Zd<br>Min",
      "fZenithDistanceMax"       => "Zd<br>Max",
@@ -111 +107 @@
     $tables = array
         (
-         "fNumEvents"                        => $fromtable . ".fNumEvents",
+         "fNumEvents"                        => "CorsikaInfo.fNumEvents",
          "fMCRunNumber"                      => "MCCorsikaRunData.fMCRunNumber",
          "fRawFileAvail"                     => "RunProcessStatus.fRawFileAvail",
          "SUM(fRunTime)/3600"                => "'Time [h]'",
          "SUM(fNumEvents)"                   => "'Evts'",
-         "fStartTime"                        => "fStartTime",
-         "fFailedTime"                       => "fFailedTime",
-         "fReturnCode"                       => "fReturnCode",
-         "fProgramId"                        => "fProgramId",
          "fParticleTypeName"                 => "ParticleType.fParticleTypeName",
          "fRunTypeName"                      => "RunType.fRunTypeName",

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

@@ -87 +87 @@
                         $query0 .= " CONCAT('failed (', " . $key . "Status.fReturnCode, ')'), ";
                         $query0 .= " CONCAT('done (', " . $key . "Status.fStopTime, ";
-                        $query0 .= " ',', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')')))) ";
+                        $query0 .= " ', ', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')')))) ";
 
                         //$query0 .= ", CONCAT( 'halo', " . $key . "Status.fStartTime)";
@@ -103 +103 @@
 
         foreach ($_GET as $key => $element)
-            if (($_GET[$key]=="On" || $groups>0))// && !empty($joins[$key]))
+            if (($_GET[$key]=="On" || $groups>0 || $statusgroups>0))// && !empty($joins[$key]))
                 $query0 .= GetJoin($fromtable,$key);
 
@@ -210 +210 @@
         printf("<img id='allbutton' src='minus.png' alt='-' onclick=\"showhide('all')\"> <b>Menu</b>&nbsp;&nbsp;&nbsp;&nbsp;\n");
         printf("&nbsp;&nbsp;<img id='infobutton'   src='plus.png' alt='+' onClick=\"showhide('info');showhide('info2')\"> MCRunInfo  \n");
-        printf("&nbsp;&nbsp;<img id='statbutton'   src='plus.png' alt='+' onClick=\"showhide('stat');showhide('fail')\">  StatusInfo \n");
+        printf("&nbsp;&nbsp;<img id='statbutton'   src='plus.png' alt='+' onClick=\"showhide('stat')\">  StatusInfo \n");
         printf("&nbsp;&nbsp;<img id='rangesbutton' src='plus.png' alt='+' onClick=\"showhide('ranges')\">                 Ranges     \n");
 
         printf(" <div id='all' style='display:block'>");
         PrintMCRunInfoMenu($host,$user,$pw,$db);
-//        PrintRunInfo2Menu($host,$user,$pw,$db);
         PrintMCRunStatMenu();
-        PrintFailMenu();
         printf(" <div id='ranges' style='display:none'>");
-//        PrintSequMenu($host,$user,$pw,$db);
-//        PrintNightRangeMenu($host,$user,$pw,$db, "RunData");
         printf("<p>");
-//        PrintZdRangeMenu($host,$user,$pw,$db);
         PrintMCRunRangeMenu($host,$user,$pw,$db);
-//        printf(" <P>\n");
-//        PrintSourceMenu($host,$user,$pw,$db);
         printf("<p>");
         printf("</div>");