Changeset 7508

Timestamp:

02/15/06 13:21:58 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/findoffdata.php (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/15 Daniel Hoehne
+
+   * datacenter/db/magicdefs.php, querycal.php, sequinfo.php:
+     - implemented query for mean signal inner/outer and mean pulsepos
+   * datacenter/db/sequence.php:
+     - implemented query for mean signal inner/outer, mean pulsepos
+       and inhomogeneity
+
+
+
  2006/02/15 Daniela Dorner, Daniel Hoehne
 

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

@@ -155 +155 @@
         }
 
+        if (!empty($_GET["fStarStart"]))
+        {
+            if (strpos(strrev($query0), " DNA ")!=0 || !strpos(strrev($query0), " DNA "))
+                $query0 .= " AND ";
+
+            $starstart=substr($_GET["fStarStart"], 0, 10);
+            $query0 .=" fStar >= '" . $starstart . " 00:00:00' ";
+        }
+
+        if (!empty($_GET["fStarStop"]))
+        {
+            if (strpos(strrev($query0), " DNA ")!=0 || !strpos(strrev($query0), " DNA "))
+                $query0 .= " AND ";
+
+            $starstop=substr($_GET["fStarStop"], 0, 10);
+            $query0 .= " fStar < '" . $starstop . " 00:00:00' ";
+        }
+
         if ($groups>0)
         {
@@ -467 +485 @@
         printf(" <p>\n");
 
-        printf(" <table>\n");
-        printf("  <tr>\n");
-
-        CheckBox("fLinks",    "Links");
-        CheckBox("fOff",      "incl. offsources");
-        CheckBox("fOnlyOff",  "only offsources");
-
-        printf("  </tr>\n");
-        printf(" </table>\n");
-        printf(" <p>\n");
-
-
         printf("  </td><td valign='top'>\n");
 
@@ -489 +495 @@
         printf("  </td></tr><tr><td colspan='2' align='center'>\n");
 
+        printf(" <p>\n");
+
+        printf(" <table>\n");
+        printf("  <tr><td>\n");
+
+        if (empty($_GET["fStarStart"]))
+            $starmin = GetMin("fStar", "SequenceProcessStatus", $db);
+        else
+            $starmin = $_GET["fStarStart"];
+
+        if (empty($_GET["fStarStop"]))
+            $starmax = GetMax("fStar", "SequenceProcessStatus", $db);
+        else
+            $starmax = $_GET["fStarStop"];
+
+        printf("StarDone&nbsp;(yyyy-mm-dd)&nbsp;from&nbsp;<input name=\"fStarStart\" type=\"text\" size=\"10\" maxlength=\"10\" value=\"%s\">\n", $starmin);
+        printf("to&nbsp;<input name=\"fStarStop\" type=\"text\" size=\"10\" maxlength=\"10\" value=\"%s\">&nbsp;&nbsp;&nbsp;&nbsp;\n", $starmax);
+        printf("  </td>\n");
+        CheckBox("fLinks",    "Links");
+        CheckBox("fOff",      "incl. offsources");
+        CheckBox("fOnlyOff",  "only offsources");
+
+        printf("  </tr>\n");
+        printf(" </table>\n");
+        printf(" <p>\n");
 
         if (empty($_GET["fStartDate"]))