Index: trunk/MagicSoft/Mars/datacenter/db/sequence.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/sequence.php	(revision 7546)
+++ trunk/MagicSoft/Mars/datacenter/db/sequence.php	(revision 7578)
@@ -52,8 +52,23 @@
         $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst ";
 
-        $query0 .= " WHERE Sequences.fSequenceFirst between " . $_GET["fRunMin"] . " and " . $_GET["fRunMax"] ;
+
+        if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"]))
+            $query0 .= " WHERE Sequences.fSequenceFirst between " . $_GET["fRunMin"] . " and " . $_GET["fRunMax"] ;
         if (!empty($_GET["fSequenceNo"]))
-            $query0 .= " AND Sequences.fSequenceFirst='" . $_GET["fSequenceNo"] . "'";
-        $query0 .= " AND fSourceName REGEXP \"^" . $_GET["fSourceN"] . "\" ";
+        {
+            if (strpos($query0, " WHERE ")==FALSE)
+                $query0 .= " WHERE ";
+            else
+                $query0 .= " AND ";
+            $query0 .= " Sequences.fSequenceFirst='" . $_GET["fSequenceNo"] . "'";
+        }
+        if (!empty($_GET["fSourceN"]))
+        {
+            if (strpos($query0, " WHERE ")==FALSE)
+                $query0 .= " WHERE ";
+            else
+                $query0 .= " AND ";
+            $query0 .= " fSourceName REGEXP \"^" . $_GET["fSourceN"] . "\" ";
+        }
         $query0 .= " ORDER BY Sequences.fSequenceFirst ";
 
@@ -198,5 +213,5 @@
 
 
-    function PrintSequenceInfo($result0, $db_id, $db)
+    function PrintSequenceInfo($result0, $db_id, $db, $calibtabs, $signaltabs, $startabs)
     {
         $numres = mysql_num_rows($result0);
@@ -211,4 +226,6 @@
         {
             $firstrun=mysql_result($result0, $i, 0);
+            $num=sprintf("%08d",$firstrun);
+            $num2=substr($num,0,4);
             $lastrun=mysql_result($result0, $i, 1);
             $source=mysql_result($result0, $i, 2);
@@ -270,5 +287,5 @@
             printf(" <table BORDER=\"1\">");
             printf(" <tr BGCOLOR='#C0C0C0'>\n");
-            printf(" <th><u>Sequence#:</u> %s </th>", $firstrun);
+            printf(" <th>Sequence#: <a href=\"http://www.astro.uni-wuerzburg.de/datacenter/sequences/%s/sequence%s.txt\">%s</a> </th>", $num2, $num, $firstrun);
             printf(" </tr><tr BGCOLOR='#D0D0D0' ALIGN='left'>\n");
             printf(" <th> %s, %s, zd: %s&deg;-%s&deg;, %.2fmin ",
@@ -460,5 +477,30 @@
                     printf(" </tr>");
                     printf(" </table>");
+
+                    printf("</td></tr><tr><td>");
                 }
+
+
+                printf(" <table BORDER=\"1\">");
+                printf(" <tr BGCOLOR='#C0C0C0'>");
+                printf(" <th>plots</th>\n");
+                printf(" <tr><td>calib: ");
+                foreach($calibtabs as $key => $element)
+                    if (!$key==0)
+                        printf("<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/callisto/%s/%s/calib%s-tab%s.png\">%s</a> ", $num2, $num, $num, $key, $element);
+                printf("</td></tr>");
+                printf(" <tr><td>signal: ");
+                foreach($signaltabs as $key => $element)
+                    if (!$key==0)
+                        printf("<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/callisto/%s/%s/signal%s-tab%s.png\">%s</a> ", $num2, $num, $num, $key, $element);
+                printf("</td></tr>");
+                printf(" <tr><td>star: ");
+                foreach($startabs as $key => $element)
+                    if (!$key==0)
+                        printf("<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/star/%s/%s/star%s-tab%s.png\">%s</a> ", $num2, $num, $num, $key, $element);
+                printf("</td></tr>");
+
+                printf(" </tr>");
+                printf(" </table>");
 
                 printf(" <table BORDER=\"1\">");
@@ -510,5 +552,5 @@
     }
 
-    function PrintPage($html, $host, $user, $pw, $db)
+    function PrintPage($html, $host, $user, $pw, $db, $calibtabs, $signaltabs, $startabs)
     {
         $db_id = mysql_connect($host, $user, $pw);
@@ -527,5 +569,5 @@
         {
             if ($html=="1" || $html=="2")
-                PrintSequenceInfo($result0, $db_id, $db);
+                PrintSequenceInfo($result0, $db_id, $db, $calibtabs, $signaltabs, $startabs);
             else
                 PrintText($result0);
@@ -541,4 +583,5 @@
     include ("include.php");
     include ("db.php");
+    include ("tabs.php");
 
     ini_set("display_errors", "On");
@@ -550,5 +593,5 @@
         header("Content-Disposition: attachment; filename=query-result.txt");
 
-        PrintPage("0", $host, $user, $pw, $db);
+        PrintPage("0", $host, $user, $pw, $db, $calibtabs, $signaltabs, $startabs);
     }
     else
@@ -567,7 +610,7 @@
         {
             if (empty($_GET["fPrintTable"]))
-                PrintPage("1", $host, $user, $pw, $db);
+                PrintPage("1", $host, $user, $pw, $db, $calibtabs, $signaltabs, $startabs);
             else
-                PrintPage("2", $host, $user, $pw, $db);
+                PrintPage("2", $host, $user, $pw, $db, $calibtabs, $signaltabs, $startabs);
         }