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

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

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

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

@@ -85 +85 @@
                         $query0 .= " CONCAT('running (since ', " . $key . "Status.fStartTime, ')'), ";
                         $query0 .= " IF (NOT ISNULL(" . $key . "Status.fReturnCode), ";
-                        $query0 .= " CONCAT('failed (', " . $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), ')')))) ";
@@ -103 +103 @@
 
         foreach ($_GET as $key => $element)
-            if (($_GET[$key]=="On" || $groups>0 || $statusgroups>0))// && !empty($joins[$key]))
-                $query0 .= GetJoin($fromtable,$key);
+            if ($_GET[$key]=="On" || $_GET[$key]!=0)
+                if (strpos($query0, GetJoin($fromtable,$key))==FALSE)
+                    $query0 .= GetJoin($fromtable,$key);
 
         foreach ($checkwhere as $key => $element)
@@ -123 +124 @@
 
         if (strpos($query0, " WHERE ")==FALSE)
-            $query0 .= " WHERE ";
+            $query0 .= " WHERE";
         else
             $query0 .= " AND ";
@@ -138 +139 @@
 
         //remove WHERE or AND in the end of the query
-        $query0=ereg_replace(" WHERE \$", " ", $query0);
-        $query0=ereg_replace(" AND \$", " ", $query0);
+        $query0=preg_replace("/ WHERE\s+$/", " ", $query0);
+        $query0=preg_replace("/ AND\s+$/", " ", $query0);
 
         if ($groups>0)