Changeset 8402 for trunk/MagicSoft/Mars

Timestamp:

04/12/07 18:56:49 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• plotdb.php (modified) (1 diff)
• plotinclude.php (modified) (2 diffs)

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

@@ -122 +122 @@
     printf("<li>Be aware, that plotting timestamps, e.g. fRunStart, doesn't work. </li>");
     printf("</ul></td></tr>\n");
+
     /*
     printf("<tr><td>\n");
-    $query=GetQuery($tables, $joins);
+    $query=GetQuery($tables, $joins, "");
     printf("Q: %s</td></tr>", $query);
     */
+
     printf("</table>\n");
     printf("</center>\n");

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

@@ -40 +40 @@
 }
 
-
 function GetQuery($tables, $joins, $set)
 {
+    if (empty($_GET["prim"]))
+        $_GET["prim"]="";
     $primary=$_GET["prim"];
+    if (empty($primary))
+        return "";
+    if (empty($_GET[$primary."Col"]))
+        $_GET[$primary."Col"]="";
     $column=$_GET[$primary."Col"];
     $table=$tables[$primary];
+    if (empty($_GET["primstart"]))
+        $_GET["primstart"]="";
     $primstart=$_GET["primstart"];
+    if (empty($_GET["primstop"]))
+        $_GET["primstop"]="";
     $primstop=$_GET["primstop"];
+    if (empty($_GET[$column."Start"]))
+        $_GET[$column."Start"]="";
     $start1=$_GET[$column."Start"];
+    if (empty($_GET[$column."Stop"]))
+        $_GET[$column."Stop"]="";
     $stop1=$_GET[$column."Stop"];
 
@@ -59 +72 @@
     if ($_GET["plot"]=="val")
     {
+        if (empty($_GET[$primary."Col2"]))
+            $_GET[$primary."Col2"]="";
         $column2=$_GET[$primary."Col2"];
+        if (empty($_GET[$column2."Start2"]))
+            $_GET[$column2."Start2"]="";
         $start2=$_GET[$column2."Start2"];
+        if (empty($_GET[$column2."Stop2"]))
+            $_GET[$column2."Stop2"]="";
         $stop2=$_GET[$column2."Stop2"];