Changeset 9895 for trunk

Timestamp:

08/26/10 14:33:11 (14 years ago)

Author:

Daniela Dorner

Message:

implemented status 'crashed' for list of runs

File:

• trunk/Mars/datacenter/db/mcinfo.php (modified) (2 diffs)

trunk/Mars/datacenter/db/mcinfo.php

@@ -24 +24 @@
                     if ($element==-1)
                         $query0 .=  $key . " as '" . $alias[$key] . "' " . ", ";
-                /*
-                 //--------------------------------------------------
-                 //$query0 .= " TIMEDIFF(fRunStop, fRunStart), ";
-                 // Only available in MySQL>4.1.1
-                 $query0 .= "SUM(if(TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)<0, " .
-                 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)+24*60*60, " .
-                 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)))/3600 as '" . $alias["SUM(fRunTime)/3600"] . "', ";
-                 //--------------------------------------------------
-                 $query0 .= " SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "', ";
-                 $query0 .= " Min(fZenithDistance) as '" . $alias["Min(fZenithDistance)"] . "', ";
-                 $query0 .= " Max(fZenithDistance) as '" . $alias["Max(fZenithDistance)"] . "', ";
-                 */
             }
 
@@ -80 +68 @@
                         $query0 .= " ISNULL(" . $key . "Status.fStopTime) AND ";
                         $query0 .= " ISNULL(" . $key . "Status.fReturnCode), 'not done', ";
+
                         $query0 .= " IF (NOT ISNULL(" . $key . "Status.fStartTime) ";
                         $query0 .= " AND ISNULL(" . $key . "Status.fStopTime) ";
-                        $query0 .= " AND ISNULL(" . $key . "Status.fReturnCode), ";
-                        $query0 .= " CONCAT('running (since ', " . $key . "Status.fStartTime, ')'), ";
+                        $query0 .= " AND ISNULL(" . $key . "Status.fReturnCode) ";
+                        $query0 .= " AND DATE_SUB(Now(),INTERVAL " . $timelimits[$key] . " HOUR) > " . $key . "Status.fStartTime, ";
+                        $query0 .= " CONCAT('maybe crashed (started at ', " . $key . "Status.fStartTime, ')'), ";
+
+                        $query0 .= " IF (NOT ISNULL(" . $key . "Status.fStartTime) ";
+                        $query0 .= " AND ISNULL(" . $key . "Status.fStopTime) ";
+                        $query0 .= " AND ISNULL(" . $key . "Status.fReturnCode) ";
+                        $query0 .= " AND DATE_SUB(Now(),INTERVAL " . $timelimits[$key] . " HOUR) < " . $key . "Status.fStartTime, ";
+                        $query0 .= " CONCAT('running (started at ', " . $key . "Status.fStartTime, ')'), ";
+
                         $query0 .= " IF (NOT ISNULL(" . $key . "Status.fReturnCode), ";
                         $query0 .= " CONCAT('failed (', " . $key . "Status.fReturnCode, ', ', " . $key . "Status.fStopTime, ')'), ";
                         $query0 .= " CONCAT('done (', " . $key . "Status.fStopTime, ";
-                        $query0 .= " ', ', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')')))) ";
-
-                        //$query0 .= ", CONCAT( 'halo', " . $key . "Status.fStartTime)";
+                        $query0 .= " ', ', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')'))))) ";
+
                         $query0 .= " AS '" . $alias[$key] . "' ";
-                        //echo "ereg: " . $key . "<br>";
                     }
                     else