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

Timestamp:

02/24/06 19:12:49 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• datacheck.php (modified) (7 diffs)
• datasetinfo.php (modified) (6 diffs)
• dbstatus.php (modified) (6 diffs)
• findoffdata.php (modified) (7 diffs)
• include.php (modified) (4 diffs)
• magicdefs.php (modified) (6 diffs)
• runinfo.php (modified) (7 diffs)
• sequinfo.php (modified) (9 diffs)
• statusrps.php (modified) (8 diffs)
• statussbs.php (modified) (7 diffs)
• statussps.php (modified) (7 diffs)

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup)
+    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs)
     {
         $fromtable="RunData";
@@ -35 +35 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'Runs'";
@@ -100 +101 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fRawFileAvail");
-        $query0 .= StatusQuery("fDataCheckDone");
+        $query0 .= StatusQuery("fRawFileAvail", $needs);
+        $query0 .= StatusQuery("fDataCheckDone", $needs);
 
         $query0 .= EnumQuery("fHasSignal");
@@ -379 +380 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup)
+    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -389 +390 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup);
+        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -420 +421 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup);
+        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs);
     }
     else
@@ -437 +438 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup);
+                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs);
             else
-                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup);
+                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $checkenumgroup, $needs);
         }
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup)
+    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $fromtable="DataSets";
@@ -30 +30 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'DataSet#'";
@@ -83 +84 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fDataSetInserted");
-        $query0 .= StatusQuery("fStarFilesAvail");
-        $query0 .= StatusQuery("fGanymed");
-        $query0 .= StatusQuery("fFillGanymed");
+        $query0 .= StatusQuery("fDataSetInserted", $needs);
+        $query0 .= StatusQuery("fStarFilesAvail", $needs);
+        $query0 .= StatusQuery("fGanymed", $needs);
+        $query0 .= StatusQuery("fFillGanymed", $needs);
 
         if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
@@ -332 +333 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup)
+    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -342 +343 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup);
+        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -390 +391 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
             else
-                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
         }
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias)
+    function CreateQuery($_GET, $alias, $needs)
     {
         $joins = array
@@ -72 +72 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'Sequence#'";
@@ -125 +126 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fSequenceFileWritten");
-        $query0 .= StatusQuery("fAllFilesAvail");
-        $query0 .= StatusQuery("fCallisto");
-        $query0 .= StatusQuery("fFillCallisto");
-        $query0 .= StatusQuery("fStar");
-        $query0 .= StatusQuery("fFillStar");
+        $query0 .= StatusQuery("fSequenceFileWritten", $needs);
+        $query0 .= StatusQuery("fAllFilesAvail", $needs);
+        $query0 .= StatusQuery("fCallisto", $needs);
+        $query0 .= StatusQuery("fFillCallisto", $needs);
+        $query0 .= StatusQuery("fStar", $needs);
+        $query0 .= StatusQuery("fFillStar", $needs);
 
         if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
@@ -330 +331 @@
     }
 
-    function PrintPage($html, $db)
+    function PrintPage($html, $db, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -353 +354 @@
             );
 
-        $query0 = CreateQuery($_GET, $alias);
+        $query0 = CreateQuery($_GET, $alias, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -400 +401 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db);
+                PrintPage("1", $db, $needs);
             else
-                PrintPage("2", $db);
+                PrintPage("2", $db, $needs);
         }
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup)
+    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $fromtable="Sequences";
@@ -36 +36 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'Sequence'";
@@ -119 +120 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fStar");
+        $query0 .= StatusQuery("fStar", $needs);
 
         if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
@@ -603 +604 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms)
+    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -613 +614 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup);
+        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -644 +645 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms);
+        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms, $needs);
     }
     else
@@ -661 +662 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms);
-            else
-                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms);
+                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms, $needs);
+            else
+                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $limits, $rms, $needs);
         }
 

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

@@ -104 +104 @@
 }
 
-function StatusQuery($name)
+function StatusQuery($name, $needs)
 {
     $var  = $name . "Status";
@@ -112 +112 @@
     case 0: $txt .= ""; break;
     case 1: $txt .= "NOT (IsNull(" . $name . ") OR " . $name . "='1970-01-01 00:00:00') AND "; break;
-    case 2: $txt .= "IsNull(" . $name . ") AND "; break;
+    case 2: $txt .= "IsNull(" . $name . ") AND IsNull(fStartTime) AND IsNull(fFailedTime) AND NOT IsNull(" . $needs[$name] . ") AND "; break;
     case 3: $txt .= $name ."='1970-01-01 00:00:00' AND "; break;
-    case 4: $txt .= ""; break;
+    case 4: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval 12 hour) < fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break;
+    case 5: $txt .= " (IsNull(" . $name . ") AND NOT IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND NOT IsNull(" . $needs[$name] . ")) AND "; break;
+    case 6: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval 12 hour) > fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break;
+//    case 6: $txt .= "crashed"; break;
+    case 7: $txt .= ""; break;
     }
     return $txt;
@@ -138 +142 @@
           2 => "not done",
           3 => "not to be done",
-          4 => "group by"
+          4 => "running",
+          5 => "failed",
+          6 => "crashed",
+          7 => "group by",
         );
 
     $stat=$_GET[$var];
-    for ($i=0; $i<5; $i++)
+    for ($i=0; $i<8; $i++)
     {
         if ($stat==$i)
@@ -399 +406 @@
     foreach ($_GET as $key => $element)
         if ($key==$column)
-            if ($element==4)
+            if ($element==7)
                 return -1;
     return 0;

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

@@ -1 +1 @@
 <?php
+
+$needs = array
+    (
+     "fCCFilled"             => "SequenceBuildStatus.fDate",
+     "fExclusionsDone"       => "fCCFilled",
+     "fSequenceEntriesBuilt" => "fExclusionsDone",
+     "fCCFileAvail"          => "RunProcessStatus.fRunNumber",
+     "fCaCoFileAvail"        => "RunProcessStatus.fRunNumber",
+     "fCaCoFileFound"        => "RunProcessStatus.fRunNumber",
+     "fRawFileAvail"         => "RunProcessStatus.fRunNumber",
+     "fDataCheckDone"        => "fRawFileAvail",
+     "fTimingCorrection"     => "fRawFileAvail",
+     "fSequenceFileWritten"  => "SequenceProcessStatus.fSequenceFirst",
+     "fAllFilesAvail"        => "fSequenceFileWritten",
+     "fCallisto"             => "fAllFilesAvail",
+     "fStar"                 => "fCallisto",
+     "fFillCallisto"         => "fCallisto",
+     "fFillStar"             => "fStar",
+     "fDataSetInserted"      => "DataSetProcessStatus.fDataSetNumber",
+     "fStarFilesAvail"       => "fDataSetInserted",
+     "fGanymed"              => "fStarFilesAvail",
+     "fFillGanymed"          => "fGanymed",
+     );
+
 
 $limits = array
@@ -70 +94 @@
      "fCaCoFileAvail"                    => CheckStatusGroup("fCaCoFileAvailStatus",       $_GET),
      "fCaCoFileFound"                    => CheckStatusGroup("fCaCoFileFoundStatus",       $_GET),
-     "fRawFileAvail"                     => CheckStatusGroup("fRawFileAvailStatu",         $_GET),
+     "fRawFileAvail"                     => CheckStatusGroup("fRawFileAvailStatus",        $_GET),
      "fTimingCorrection"                 => CheckStatusGroup("fTimingCorrectionStatus",    $_GET),
      "fDataCheckDone"                    => CheckStatusGroup("fDataCheckDoneStatus",       $_GET),
@@ -145 +169 @@
      "fCaCoFileAvail"                   => "CaCoFile",
      "fCaCoFileFound"                   => "CaCoRun",
-     "fRawFileAvail"                    => "Rawfile",
+     "fRawFileAvail"                    => "RawFile",
      "fTimingCorrection"                => "TimingCorr",
      "fDataCheckDone"                   => "Datacheck",
@@ -236 +260 @@
      "fEMin"                            => "Emin",
      "fEMax"                            => "Emax",
+     "fStartTime"                       => "Process",
+     "fFailedTime"                      => "Failed",
+     "fReturnCode"                      => "Ret<br>Code",
+     "fFailedCode"                      => "Err<br>Code",
+     "fFailedCodeAdd"                   => "Code<br>Add",
     );
 
@@ -309 +338 @@
      $alias["fPositionAsymInterlaced"]   => "1",
      $alias["fHeightAsymInterlaced"]     => "1",
+     $alias["fReturnCode"]               => "1",
+     $alias["fFailedCode"]               => "1",
+     $alias["fFailedCodeAdd"]            => "1",
      "Time"                              => "1",
 //     "Time [h]"                 => "1",
@@ -468 +500 @@
          "Max(fZenithDistance)"              => "'ZdMax'",
 //         "COUNT(*)"                          => "'Sequ'",
+         "fStartTime"                       => "fStartTime",
+         "fFailedTime"                      => "fFailedTime",
+         "fReturnCode"                      => "fReturnCode",
+         "fFailedCode"                      => "fFailedCode",
+         "fFailedCodeAdd"                   => "fFailedCodeAdd",
         );
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup)
+    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $fromtable="RunData";
@@ -40 +40 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'Run#'";
@@ -92 +93 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fCCFileAvail");
-        $query0 .= StatusQuery("fCaCoFileAvail");
-        $query0 .= StatusQuery("fCaCoFileFound");
-        $query0 .= StatusQuery("fRawFileAvail");
-        $query0 .= StatusQuery("fDataCheckDone");
-        $query0 .= StatusQuery("fTimingCorrection");
+        $query0 .= StatusQuery("fCCFileAvail", $needs);
+        $query0 .= StatusQuery("fCaCoFileAvail", $needs);
+        $query0 .= StatusQuery("fCaCoFileFound", $needs);
+        $query0 .= StatusQuery("fRawFileAvail", $needs);
+        $query0 .= StatusQuery("fDataCheckDone", $needs);
+        $query0 .= StatusQuery("fTimingCorrection", $needs);
 
         if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
@@ -476 +477 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup)
+    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -487 +488 @@
         mysql_query("SET BIG_TABLES=1"); // necessary for mySQL <= 4
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup);
+        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -518 +519 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
     }
     else
@@ -535 +536 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
             else
-                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
         }
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup)
+    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $fromtable="Sequences";
@@ -36 +36 @@
                 foreach ($checkstatusgroup as $key => $element)
                     if ($element==-1)
-                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                        $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
                 $query0 .= " count(*) as 'Sequence'";
@@ -110 +111 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fSequenceFileWritten");
-        $query0 .= StatusQuery("fAllFilesAvail");
-        $query0 .= StatusQuery("fCallisto");
-        $query0 .= StatusQuery("fFillCallisto");
-        $query0 .= StatusQuery("fStar");
-        $query0 .= StatusQuery("fFillStar");
+        $query0 .= StatusQuery("fSequenceFileWritten", $needs);
+        $query0 .= StatusQuery("fAllFilesAvail", $needs);
+        $query0 .= StatusQuery("fCallisto", $needs);
+        $query0 .= StatusQuery("fFillCallisto", $needs);
+        $query0 .= StatusQuery("fStar", $needs);
+        $query0 .= StatusQuery("fFillStar", $needs);
 
         if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
@@ -385 +386 @@
             $_GET["fMaxHumidity"]="Off";
 
+        if (empty($_GET["fStartTime"]))
+            $_GET["fStartTime"]="Off";
+
+        if (empty($_GET["fFailedTime"]))
+            $_GET["fFailedTime"]="Off";
+
+        if (empty($_GET["fReturnCode"]))
+            $_GET["fReturnCode"]="Off";
+
+        if (empty($_GET["fFailedCode"]))
+            $_GET["fFailedCode"]="Off";
+
+        if (empty($_GET["fFailedCodeAdd"]))
+            $_GET["fFailedCodeAdd"]="Off";
+
     }
 
@@ -426 +442 @@
         printf("</td></tr> </table>\n");
         printf(" <p>\n");
+
+        printf(" <table>\n");
+        printf("  <tr>\n");
+
+        CheckBox("fStartTime",     "StartTime");
+        CheckBox("fFailedTime",    "FailedTime");
+        CheckBox("fReturnCode",    "ErrCode");
+        CheckBox("fFailedCode",    "RetCode");
+        CheckBox("fFailedCodeAdd", "CodeAdd");
+
+        printf("  </tr>\n");
+        printf(" </table>\n");
+        printf(" <p>\n");
+
         printf(" <table>\n");
         printf("  <tr>\n");
@@ -584 +614 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup)
+    function PrintPage($html, $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -594 +624 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup);
+        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -625 +655 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+        PrintPage("0", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
     }
     else
@@ -642 +672 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("1", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
             else
-                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup);
+                PrintPage("2", $db, $alias, $rightalign, $checkwhere, $checkgroup, $checkstatusgroup, $needs);
         }
 

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere)
+    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs)
     {
         $query0 = "SELECT ";
@@ -14 +14 @@
             foreach ($checkstatusgroup as $key => $element)
                 if ($element==-1)
-                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $key . "', ";
+                    $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $key . "', ";
 
             $query0 .= " count(*) as 'Run#'";
@@ -36 +37 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fCCFileAvail");
-        $query0 .= StatusQuery("fCaCoFileAvail");
-        $query0 .= StatusQuery("fCaCoFileFound");
-        $query0 .= StatusQuery("fRawFileAvail");
-        $query0 .= StatusQuery("fDataCheckDone");
-        $query0 .= StatusQuery("fTimingCorrection");
+        $query0 .= StatusQuery("fCCFileAvail", $needs);
+        $query0 .= StatusQuery("fCaCoFileAvail", $needs);
+        $query0 .= StatusQuery("fCaCoFileFound", $needs);
+        $query0 .= StatusQuery("fRawFileAvail", $needs);
+        $query0 .= StatusQuery("fDataCheckDone", $needs);
+        $query0 .= StatusQuery("fTimingCorrection", $needs);
 
         $query0 .= "fRunNumber BETWEEN " . $_GET["fRunMin"] . " AND " . $_GET["fRunMax"] . " ";
@@ -52 +53 @@
                 if ($element==-1)
                 {
-                    $query0 .= $key;
+                    $query0 .= $alias[$key];
                     if ($num-->1)
                         $query0 .= ", ";
@@ -189 +190 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere)
+    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -199 +200 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere);
+        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -230 +231 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
     }
     else
@@ -244 +245 @@
             printf("No query submitted yet.<BR>");
         else
-            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
 
         echo (file_get_contents("index-footer.html"));

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere)
+    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs)
     {
         $statusgroups = 0;
@@ -14 +14 @@
             foreach ($checkstatusgroup as $key => $element)
                 if ($element==-1)
-                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                    $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
             $query0 .= " count(*) as '#days'";
@@ -43 +44 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fCCFilled");
-        $query0 .= StatusQuery("fExclusionsDone");
-        $query0 .= StatusQuery("fSequenceEntriesBuilt");
+        $query0 .= StatusQuery("fCCFilled", $needs);
+        $query0 .= StatusQuery("fExclusionsDone", $needs);
+        $query0 .= StatusQuery("fSequenceEntriesBuilt", $needs);
 
         $query0 .= "fDate BETWEEN '" . $_GET["fRunMin"] . "' AND '" . $_GET["fRunMax"] . "' ";
@@ -165 +166 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere)
+    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -175 +176 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere);
+        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -206 +207 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
     }
     else
@@ -220 +221 @@
             printf("No query submitted yet.<BR>");
         else
-            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
 
         echo (file_get_contents("index-footer.html"));

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere)
+    function CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs)
     {
         $statusgroups = 0;
@@ -14 +14 @@
             foreach ($checkstatusgroup as $key => $element)
                 if ($element==-1)
-                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+                    $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval 12 hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
+//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
 
             $query0 .= " count(*) as 'Sequence#'";
@@ -40 +41 @@
             $query0 .= " AND ";
 
-        $query0 .= StatusQuery("fSequenceFileWritten");
-        $query0 .= StatusQuery("fAllFilesAvail");
-        $query0 .= StatusQuery("fCallisto");
-        $query0 .= StatusQuery("fFillCallisto");
-        $query0 .= StatusQuery("fStar");
-        $query0 .= StatusQuery("fFillStar");
+        $query0 .= StatusQuery("fSequenceFileWritten", $needs);
+        $query0 .= StatusQuery("fAllFilesAvail", $needs);
+        $query0 .= StatusQuery("fCallisto", $needs);
+        $query0 .= StatusQuery("fFillCallisto", $needs);
+        $query0 .= StatusQuery("fStar", $needs);
+        $query0 .= StatusQuery("fFillStar", $needs);
 
         $query0 .= "fSequenceFirst BETWEEN " . $_GET["fRunMin"] . " AND " . $_GET["fRunMax"] . " ";
@@ -178 +179 @@
     }
 
-    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere)
+    function PrintPage($html, $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs)
     {
         $db_id = mysql_connect("hercules.astro.uni-wuerzburg.de", "MAGIC", "d99swMT!");
@@ -188 +189 @@
         mysql_select_db($db);
 
-        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere);
+        $query0 = CreateQuery($_GET, $alias, $checkstatusgroup, $checkwhere, $needs);
 
         $result0 = mysql_query($query0, $db_id);
@@ -219 +220 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+        PrintPage("0", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
     }
     else
@@ -233 +234 @@
             printf("No query submitted yet.<BR>");
         else
-            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere);
+            PrintPage("1", $db, $alias, $rightalign, $checkstatusgroup, $checkwhere, $needs);
 
         echo (file_get_contents("index-footer.html"));