Changeset 9498 for trunk/MagicSoft/Mars/datacenter/db/ctamcinfo.php

Timestamp:

08/20/09 14:43:59 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/ctamcinfo.php (modified) (7 diffs)

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

@@ -1 +1 @@
 <?php
 {
-    function CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs, $timelimits)
+    function CreateQuery($alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs, $timelimits)
     {
         $fromtable="MCRunData";
@@ -15 +15 @@
                 $statusgroups++;
 
-        $query0 = "SELECT ";
+        $query0 = "SELECT SQL_CALC_FOUND_ROWS ";
 
         if ($groups>0 || $statusgroups>0)
@@ -204 +204 @@
 
         if (empty($_GET["fNumStart"]))
-            $_GET["fNumStart"]=0;
+            $start=0;
+        else
+            $start=$_GET["fNumStart"];
 
         if (empty($_GET["fSendTxt"]))
-            $query0 .= " LIMIT " . $_GET["fNumStart"] . ", " . $_GET["fNumResults"];
+            $query0 .= " LIMIT " . $start . ", " . $_GET["fNumResults"];
 
         return $query0;
     }
 
-    function InitGet($_GET)
+    function InitGet()
     {
         // Find out whether it is the first call to the php script
@@ -220 +222 @@
     }
 
-    function PrintForm($_GET, $host, $user, $pw, $db)
+    function PrintForm($host, $user, $pw, $db)
     {
         printf("<center>\n");
@@ -279 +281 @@
         mysql_query("SET BIG_TABLES=1"); // necessary for mySQL <= 4
 
-        $query0 = CreateQuery($_GET, $alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs, $timelimits);
+        $query0 = CreateQuery($alias, $checkwhere, $checkgroup, $checkstatusgroup, $needs, $timelimits);
 
         $result0 = mysql_query($query0, $db_id);
+        $result1 = mysql_query("SELECT FOUND_ROWS()", $db_id);
 
         if ($result0)
         {
             if ($html=="1" || $html=="2")
-                PrintMagicTable($result0, $alias, $rightalign, "", "", "", "", $_GET);
+                PrintMagicTable($result0, $alias, $rightalign, "", "", "", $result1);
             else
                 PrintText($result0);
 
             mysql_free_result($result0);
+            mysql_free_result($result1);
         }
         mysql_close($db_id);
@@ -298 +302 @@
 
     include ("include.php");
-    include ("db.php");
+    include ("db2.php");
     include ("menu.php");
     include ("ctadefs.php");
@@ -319 +323 @@
         $environment = sizeof($_GET);
 
-        InitGet($_GET);
+        InitGet();
         if (empty($_GET["fPrintTable"]))
-            PrintForm($_GET, $host, $user, $pw, $db);
+            PrintForm($host, $user, $pw, $db);
 
         if ($environment==0)