Changeset 9617 for trunk/MagicSoft/Mars/datacenter/db/menu.php

Timestamp:

07/28/10 14:38:30 (14 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/menu.php (modified) (11 diffs)

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

@@ -9 +9 @@
 
     CheckBox("fNumEvents",        "Num of events");
-    CheckBox("fEnergyMin",        "Emin");
-    CheckBox("fEnergyMax",        "Emax");
-    CheckBox("fEnergySlope",      "Slope");
+    CheckBox("fSequenceNumber",   "Sequ#");
 
     printf("  </tr><tr>\n");
@@ -22 +20 @@
     printf("  </tr><tr>\n");
 
-    CheckBox("fZenithDistanceMin", "Zenith distance min");
-    CheckBox("fZenithDistanceMax", "Zenith distance max");
+    CheckBox("fZenithDistanceMin", "Zenith dist. min");
+    CheckBox("fZenithDistanceMax", "Zenith dist. max");
     CheckBox("fAzimuthMin",        "Azimuth min");
     CheckBox("fAzimuthMax",        "Azimuth max");
+
+    printf("  </tr><tr>\n");
+
+    CheckBox("fEnergyMin",        "Emin");
+    CheckBox("fEnergyMax",        "Emax");
+    CheckBox("fEnergySlope",      "Slope");
 
     printf("  </tr><tr>\n");
@@ -633 +637 @@
 {
     if (empty($_GET["fRunMin"]))
-        $min = GetMin("fRunNumber", "CorsikaInfo", $host, $user, $pw, $db);
+        $min = GetMin("fRunNumber", "CeresInfo", $host, $user, $pw, $db);
     else
         $min = $_GET["fRunMin"];
 
     if (empty($_GET["fRunMax"]))
-        $max = GetMax("fRunNumber", "CorsikaInfo", $host, $user, $pw, $db);
+        $max = GetMax("fRunNumber", "CeresInfo", $host, $user, $pw, $db);
     else
         $max = $_GET["fRunMax"];
@@ -790 +794 @@
 }
 
-function InitFailInfo($first)
-{
-    if (empty($_GET["fStartTime"]))
-        $_GET["fStartTime"]="Off";
-
-    if (empty($_GET["fFailedTime"]))
-        $_GET["fFailedTime"]="Off";
-
-    if (empty($_GET["fReturnCode"]))
-        $_GET["fReturnCode"]="Off";
-
-    if (empty($_GET["fProgramId"]))
-        $_GET["fProgramId"]="Off";
-}
-
 function InitInfo($first)
 {
@@ -810 +799 @@
         $_GET["fNumResults"]="20";
 
-    if (empty($_GET["fNumEvents"]))
-        $_GET["fNumEvents"]="Off";
-
     if (empty($_GET["fRunStart"]))
         $_GET["fRunStart"]="Off";
@@ -908 +894 @@
     InitRunStatus($first);
     InitInfo($first);
-    InitFailInfo($first);
+
+    if (empty($_GET["fNumEvents"]))
+        $_GET["fNumEvents"]=$first?"Off":"";
 
     if (empty($_GET["fLinks"]))
@@ -1185 +1173 @@
     InitInfo($first);
     InitSequStatus($first);
-    InitFailInfo($first);
     InitCalInfo($first);
     InitStarInfo($first);
 
+    if (empty($_GET["fNumEvents"]))
+        $_GET["fNumEvents"]=$first?"Off":"";
+
     if (empty($_GET["fRunTime/60"]))
         $_GET["fRunTime/60"]="Off";
@@ -1256 +1246 @@
 {
     InitDataSetStatus($first);
-    InitFailInfo($first);
 
     if (empty($_GET["fNumResults"]))
@@ -1612 +1601 @@
     InitCTAMCRunStatus($first);
     InitInfo($first);
-    InitFailInfo($first);
+
+    if (empty($_GET["fNumEvents"]))
+        $_GET["fNumEvents"]=$first?"Off":"";
 
     if (empty($_GET["fObsLevel"]))
@@ -1671 +1662 @@
     InitMCRunStatus($_GET, $first);
     InitInfo($_GET, $first);
-    InitFailInfo($_GET, $first);
 
     if (empty($_GET["fParticleTypeName"]))
@@ -1685 +1675 @@
         $_GET["fNumEvents"]=$first?"On":"";
 
+    if (empty($_GET["fSequenceNumber"]))
+        $_GET["fSequenceNumber"]=$first?"On":"";
+
     if (empty($_GET["fZenithDistanceMin"]))
-        $_GET["fZenithDistanceMin"]=$first?"On":"";
+        $_GET["fZenithDistanceMin"]=$first?"Off":"";
 
     if (empty($_GET["fZenithDistanceMax"]))
-        $_GET["fZenithDistanceMax"]=$first?"On":"";
+        $_GET["fZenithDistanceMax"]=$first?"Off":"";
 
     if (empty($_GET["fAzimuthMin"]))
-        $_GET["fAzimuthMin"]=$first?"On":"";
+        $_GET["fAzimuthMin"]=$first?"Off":"";
 
     if (empty($_GET["fAzimuthMax"]))
-        $_GET["fAzimuthMax"]=$first?"On":"";
+        $_GET["fAzimuthMax"]=$first?"Off":"";
 
     if (empty($_GET["fEnergyMin"]))