Index: trunk/MagicSoft/Mars/datacenter/db/include.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/include.php	(revision 9505)
+++ trunk/MagicSoft/Mars/datacenter/db/include.php	(revision 9509)
@@ -288,15 +288,5 @@
         $checked = "";
 
-    printf("    <td><input type='checkbox' name='%s' value='On' %s>%s</td>\n", $value, $checked, $text);
-}
-
-function Checkbox2($value, $text)
-{
-    if ($_SESSION[$value]=="On")
-        $checked = "checked";
-    else
-        $checked = "";
-
-    printf("    <td><input type='checkbox' name='%s' value='On' %s>%s</td>\n", $value, $checked, $text);
+    printf("<td><input type='checkbox' name='%s' value='On' %s>%s</td>\n", $value, $checked, $text);
 }
 
@@ -308,5 +298,5 @@
         $checked = "";
 
-    printf("    <td><input type='radio' name='%s' value='%s' %s>%s</td>\n", $name, $value, $checked, $text);
+    printf("<td><input type='radio' name='%s' value='%s' %s>%s</td>\n", $name, $value, $checked, $text);
 }
 
@@ -397,18 +387,16 @@
 function GetClearedURL($all)
 {
-//    $url=htmlspecialchars($_SERVER["REQUEST_URI"]);
     $url=$_SERVER["REQUEST_URI"];
-//    echo "before:".$url."<br>";
     if ($all=="yes")
     {
-//        echo "replace <br>";
-//        $url=str_replace("&DisplaySelected", "halo", $url);
-        $url=str_replace("&DisplaySelected=yes", "", $url);
-        $url=str_replace("&DisplaySelected=no", "", $url);
+        $url=str_replace("&DisplaySelected=yes",     "", $url);
+        $url=str_replace("&DisplaySelected=no",      "", $url);
+        $url=str_replace("&DisplaySelected=inverse", "", $url);
+        //reset fNumStart
+        $url=preg_replace("/&fNumStart[=][0-9]*/", "", $url);
     }
     $url=str_replace("&insert=yes", "", $url);
     $url=str_replace("&fSendTxt=2", "", $url);
     $url=str_replace("&fSendTxt=1", "", $url);
-//    echo "after:".$url."<br>";
     $url=htmlspecialchars($url);
     return $url;
@@ -418,5 +406,5 @@
 {
     if (empty($_SESSION["insert"]))
-        printf("<input type='submit' value='Update Data Set'>&nbsp;&nbsp;&nbsp;\n");
+        printf("<input type='submit' value='Update Selection'>&nbsp;&nbsp;&nbsp;\n");
     else
         printf("<input type='button' value='Continue' onClick='self.location.href=\"%s\"'>&nbsp;&nbsp;&nbsp;\n", GetClearedURL());
@@ -427,4 +415,7 @@
 function PrintDisplaySequencesButtons()
 {
+    if (!empty($_SESSION["DataSetSelection"]) && empty($_SESSION["DataSetAcknowledged"]))
+        return;
+
     if ((empty($_SESSION["DisplaySelected"]) || $_SESSION["DisplaySelected"]=="no")
         && !(empty($_SESSION["sequon"]) && empty($_SESSION["sequoff"])))
@@ -436,5 +427,6 @@
     }
 
-    if ($_SESSION["DisplaySelected"]=="yes")
+    if ($_SESSION["DisplaySelected"]=="yes"
+       && !(empty($_SESSION["sequon"]) && empty($_SESSION["sequoff"])))
     {
         PrintUpdateDataSetButton();
@@ -444,5 +436,6 @@
     }
 
-    if ($_SESSION["DisplaySelected"]=="inverse")
+    if ($_SESSION["DisplaySelected"]=="inverse"
+       && !(empty($_SESSION["sequon"]) && empty($_SESSION["sequoff"])))
     {
         PrintUpdateDataSetButton();
@@ -463,14 +456,7 @@
 
     $uri = htmlspecialchars($_SERVER["REQUEST_URI"]);
-    $pos = strpos($uri, "fNumStart");
-    $amp3=FALSE;
-    if ($pos!=FALSE)
-    {
-        $amp1 = substr($uri, 0, $pos-1);
-        $amp2 = substr($uri, $pos);
-        $amp3 = strchr($amp2, "&");
-
-        $uri = $amp1;
-    }
+    //append string in case it is not in url
+    if (!preg_match("/&fNumStart[=][0-9]*/", $uri))
+        $uri.="&amp;fNumStart=";
 
     switch($direction)
@@ -480,35 +466,26 @@
         if ($pos<0)
             $pos=0;
+        $link .= " <A HREF='" . preg_replace("/&amp;fNumStart[=][0-9]*/", "&amp;fNumStart=".$pos, $uri) . "'>< Prev</A> \n";
         break;
     case 1:
+        //display link only if more results available
+        if ($_GET["fNumStart"]+$rows==$totalnumrows)
+            break;
         $pos = $_GET["fNumStart"]+$rows;
+        $link .= " <A HREF='" . preg_replace("/&amp;fNumStart[=][0-9]*/", "&amp;fNumStart=".$pos, $uri) . "'>Next ></A> \n";
         break;
     case 2:
         $pos = 0;
+        $link .= " <A HREF='" . preg_replace("/&amp;fNumStart[=][0-9]*/", "&amp;fNumStart=".$pos, $uri) . "'><< First</A> \n";
         break;
     case 3:
+        //display link only if more results available
+        if ($_GET["fNumStart"]+$rows==$totalnumrows)
+            break;
         $pos = $totalnumrows-$rows+1;
+        $link .= " <A HREF='" . preg_replace("/&amp;fNumStart[=][0-9]*/", "&amp;fNumStart=".$pos, $uri) . "'>Last >></A> \n";
         break;
     }
 
-    $uri .= "&fNumStart=" . $pos;
-    if ($amp3!=FALSE)
-        $uri .= $amp3;
-
-    switch($direction)
-    {
-    case 0:
-        $link .= " <A HREF='" . $uri . "'>< Prev</A> \n";
-        break;
-    case 1:
-        $link .= " <A HREF='" . $uri . "'>Next ></A> \n";
-        break;
-    case 2:
-        $link .= " <A HREF='" . $uri . "'><< First</A> \n";
-        break;
-    case 3:
-        $link .= " <A HREF='" . $uri . "'>Last >></A> \n";
-        break;
-    }
     return $link;
 }
@@ -523,6 +500,6 @@
     if ($_GET["fNumStart"]!=0)
     {
-        $menu .= ReplaceInUri("fNumStart", $rows, 2);
-        $menu .= ReplaceInUri("fNumStart", $rows, 0);
+        $menu .= ReplaceInUri("fNumStart", $rows, 2, $totalnumrows);
+        $menu .= ReplaceInUri("fNumStart", $rows, 0, $totalnumrows);
     }
 
@@ -536,5 +513,5 @@
     if ($rows==$_GET["fNumResults"])
     {
-        $menu .= ReplaceInUri("fNumStart", $rows, 1);
+        $menu .= ReplaceInUri("fNumStart", $rows, 1, $totalnumrows);
         $menu .= ReplaceInUri("fNumStart", $rows, 3, $totalnumrows);
     }
@@ -546,5 +523,4 @@
     $row1 = mysql_fetch_assoc($result1);
     $totalnumrows=$row1["FOUND_ROWS()"];
-//    echo "res0: " . $row . " res1: " . $row1["FOUND_ROWS()"] . "<br>";
 
     $col   = FALSE;
@@ -581,5 +557,12 @@
             $first = FALSE;
             if ($form)
-                printf("<td>ON</td><td>Off</td><td>Not</td>");
+            {
+                printf("<td>ON<br><input type='radio' name='SelectAllSequForDS' value='ON' onclick='selectallsequences(\"ON\");' %s></td>\n",
+                       $_SESSION["SelectAllSequForDS"]=="ON"?"checked":"");
+                printf("<td>Off<br><input type='radio' name='SelectAllSequForDS' value='Off' onclick='selectallsequences(\"Off\");' %s></td>\n",
+                       $_SESSION["SelectAllSequForDS"]=="Off"?"checked":"");
+                printf("<td>Not<br><input type='radio' name='SelectAllSequForDS' value='Not' onclick='selectallsequences(\"Not\");' %s></td>\n",
+                       $_SESSION["SelectAllSequForDS"]=="Not"?"checked":"");
+            }
             foreach ($row0 as $key => $element)
             {
@@ -613,6 +596,4 @@
         if ($form)
         {
-//            CheckBox2($row0["Sequ"]."ON","");
-//            CheckBox2($row0["Sequ"]."Off","");
             RadioButton("DSSeq".$row0["Sequ"],  "ON", "");
             RadioButton("DSSeq".$row0["Sequ"], "Off", "");