Changeset 8123 for trunk/MagicSoft

Timestamp:

10/18/06 19:10:02 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/include.php (modified) (1 diff)
• datacenter/db/magicdefs.php (modified) (1 diff)
• datacenter/db/printtable.php (modified) (1 diff)
• datacenter/db/runinfo-aio.php (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -63 +63 @@
      - bugfix (order by was not working for runs/sequences/datasets
        when doing group by)
+
+   * datacenter/db/include.php, datacenter/db/magicdefs.php, 
+     datacenter/db/printtable.php:
+     - bugfix (order by was not working on printtable.php)
 
 

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

@@ -396 +396 @@
     if ($search=="# days")
         return "NumDays";
+    return $search;
     return "";
 }

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

@@ -572 +572 @@
     if ($val=="NumDays")
         $table="'# days'";
+    if (empty($table))
+        $table=$val;
     return $table;
 }

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

@@ -27 +27 @@
         mysql_select_db($db);
 
-        $query0  = "SELECT * FROM ";
-        $query0 .= $_GET["fTable"];
+        $fromtable=$_GET["fTable"];
+        $query0  = "SELECT * FROM " . $fromtable;
+        if (!empty($_GET["fSortBy"]))
+        {
+            $val=substr($_GET["fSortBy"], 0, -1);
+            $query0 .= " ORDER BY " . GetTable($fromtable,$val) . " ";
+            if (substr($_GET["fSortBy"], -1)=="-")
+                $query0 .= "DESC";
+        }
+
 
         $result0 = mysql_query($query0, $db_id);

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

@@ -173 +173 @@
         {
             $val=substr($_GET["fSortBy"], 0, -1);
-//            $query0 .= "---" . $val . "---";
             $query0 .= " ORDER BY " . GetTable($fromtable, $val) . " ";
             if (substr($_GET["fSortBy"], -1)=="-")