Changeset 10012 for trunk/Mars/datacenter/db

Timestamp:

10/18/10 17:14:38 (14 years ago)

Author:

Daniela Dorner

Message:

added 'done and avail' as status option

Location:

trunk/Mars/datacenter/db

Files:

• include.php (modified) (5 diffs)
• mcinfo.php (modified) (1 diff)

trunk/Mars/datacenter/db/include.php

@@ -63 +63 @@
         $txt .= " ";
         break;
-    case 1://done
+    case 1://done and avail
         $txt .= " NOT ISNULL(" . $name . "Status.fStartTime) AND "
             ." NOT ISNULL(" . $name . "Status.fStopTime) AND "
+            ." NOT ISNULL(" . $name . "Status.fAvailable) AND "
             ." ISNULL(" . $name . "Status.fReturnCode) AND ";
         break;
-    case 2://not done
+    case 2://done
+        $txt .= " NOT ISNULL(" . $name . "Status.fStartTime) AND "
+            ." NOT ISNULL(" . $name . "Status.fStopTime) AND "
+            ." ISNULL(" . $name . "Status.fAvailable) AND "
+            ." ISNULL(" . $name . "Status.fReturnCode) AND ";
+        break;
+    case 3://not done
         $txt .= " ISNULL(" . $name . "Status.fStartTime) AND "
             ." ISNULL(" . $name . "Status.fStopTime) AND "
             ." ISNULL(" . $name . "Status.fReturnCode) AND ";
         break;
-    case 3://not to be done
+    case 4://not to be done
         $txt .= $name ."Status.fStartTime='1970-01-01 00:00:00' AND "
             . $name ."Status.fStopTime='1970-01-01 00:00:00' AND ";
         break;
-    case 4://running
+    case 5://running
         $txt .= " NOT ISNULL(" . $name . "Status.fStartTime) AND "
             ." DATE_SUB(Now(),INTERVAL " . $timelimit . " HOUR) < " . $name . "Status.fStartTime AND "
@@ -83 +90 @@
             ." ISNULL(" . $name . "Status.fReturnCode) AND ";
         break;
-    case 5://failed
+    case 6://failed
         $txt .= " NOT ISNULL(" . $name . "Status.fStartTime) AND "
             ." NOT ISNULL(" . $name . "Status.fStopTime) AND "
             ." NOT ISNULL(" . $name . "Status.fReturnCode) AND ";
         break;
-    case 6://crashed
+    case 7://crashed
         $txt .= " NOT ISNULL(" . $name . "Status.fStartTime) AND "
             ." DATE_SUB(Now(),INTERVAL " . $timelimit . " HOUR) > " . $name . "Status.fStartTime AND "
@@ -94 +101 @@
             ." ISNULL(" . $name . "Status.fReturnCode) AND ";
         break;
-    case 7://group by
+    case 8://group by
         $txt .= "";
         break;
@@ -117 +124 @@
     $status = array
         ( 0 => "ALL",
-          1 => "done",
-          2 => "not done",
-          3 => "not to be done",
-          4 => "running",
-          5 => "failed",
-          6 => "crashed",
-          7 => "GROUP BY",
+          1 => "done and avail",
+          2 => "done",
+          3 => "not done",
+          4 => "not to be done",
+          5 => "running",
+          6 => "failed",
+          7 => "crashed",
+          8 => "GROUP BY",
         );
 
     $stat=$_GET[$var];
-    for ($i=0; $i<8; $i++)
+    for ($i=0; $i<9; $i++)
     {
         if ($stat==$i)
@@ -347 +355 @@
     foreach ($_GET as $key => $element)
         if ($key==$column."Status")
-            if ($element==7)
+            if ($element==8)
                 return -1;
     return 0;

trunk/Mars/datacenter/db/mcinfo.php

@@ -33 +33 @@
                             ." AND ISNULL(" . $key . "Status.fStopTime) "
                             ." AND ISNULL(" . $key . "Status.fReturnCode), 'not done', "
+                            //crashed
                             ." IF (NOT ISNULL(" . $key . "Status.fStartTime) "
                             ." AND DATE_SUB(Now(),INTERVAL " . $timelimits[$key] . " HOUR) > " . $key . "Status.fStartTime "
                             ." AND ISNULL(" . $key . "Status.fStopTime) "
                             ." AND ISNULL(" . $key . "Status.fReturnCode), 'crashed', "
+                            //running
                             ." IF (NOT ISNULL(" . $key . "Status.fStartTime) "
                             ." AND DATE_SUB(Now(),INTERVAL " . $timelimits[$key] . " HOUR) < " . $key . "Status.fStartTime "
                             ." AND ISNULL(" . $key . "Status.fStopTime) "
                             ." AND ISNULL(" . $key . "Status.fReturnCode), 'running', "
+                            //failed
                             ." IF (NOT ISNULL(" . $key . "Status.fStartTime) "
                             ." AND NOT ISNULL(" . $key . "Status.fStopTime) "
-                            ." AND ISNULL(" . $key . "Status.fReturnCode), 'done', 'failed' "
-                            ." )))) AS '". $key . "', ";
+                            ." AND NOT ISNULL(" . $key . "Status.fReturnCode), 'failed', "
+                            //done or done and avail
+                            ." IF (NOT ISNULL(" . $key . "Status.fStartTime) "
+                            ." AND NOT ISNULL(" . $key . "Status.fStopTime) "
+                            ." AND ISNULL(" . $key . "Status.fReturnCode)"
+                            ." AND ISNULL(" . $key . "Status.fAvailable), 'done', 'done and avail' "
+                            ." ))))) AS '". $key . "', ";
             }
             $query0 .= " COUNT(*) as '# Files' ";
             $query0 .= ", SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "' ";
+            $query0 .= ", SUM(fNumEvents*fNumReUseShowers) as '" . $alias["SUM(fNumEvents*fNumReUseShowers)"] . "' ";
         }
         else