--- rat/lonpageflip.pm	2000/10/17 10:36:17	1.8
+++ rat/lonpageflip.pm	2000/11/14 18:15:01	1.11
@@ -10,7 +10,7 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02 Gerd Kortemeyer)
 #
-# 10/03,10/05,10/06,10/07,10/09,10/10,10/11,10/16,10/17 Gerd Kortemeyer
+# 10/03,10/05,10/06,10/07,10/09,10/10,10/11,10/16,10/17,11/14 Gerd Kortemeyer
 
 package Apache::lonpageflip;
 
@@ -61,6 +61,26 @@ sub handler {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
       my $currenturl=$2;
+      if ($direction eq 'return') {
+# -------------------------------------------------------- Return to last known
+         my $last;
+         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER,0640)) {
+	     $last=$hash{'last_known'};
+             untie(%hash);
+         }
+         my $newloc;
+         if ($last) {
+            $newloc='/res/'.(split(/\_\_\_/,$last))[1];
+         } else {
+	    $newloc='/adm/noidea.html';
+         }  
+	 $r->content_type('text/html');
+         $r->header_out(Location => 
+			'http://'.$ENV{'HTTP_HOST'}.$newloc);
+                               
+         return REDIRECT;
+      }
       $currenturl=~s/^http\:\/\///;
       $currenturl=~s/^[^\/]+//;
       unless ($currenturl=~/\/res\//) {
@@ -76,8 +96,8 @@ sub handler {
 	     $r->content_type('text/html');
              $r->header_out(Location => 
                                'http://'.$ENV{'HTTP_HOST'}.'/adm/noidea.html');
+             return REDIRECT;
          }
-         return REDIRECT;
       }
 # ------------------------------------------- Do we have any idea where we are?
       my $position;
@@ -138,7 +158,7 @@ sub handler {
 # -------------------------------------------------------------------------- Up
               } elsif ($direction eq 'down') {
 # ------------------------------------------------------------------------ Down
-              }
+	      }
 # ----------------------------------------------------- Check out possibilities
               if ($next) {
                   @possibilities=split(/\,/,$next);
@@ -166,6 +186,17 @@ sub handler {
 # -------------------------------------------------------------- No place to go
                   $multichoice=-1;
               }
+# ------------------------------------------------------ Set parameters, if any
+              if ($redirecturl) {
+		  if ($hash{'param_'.$next}) {
+		     my ($mapid,$resid)=split(/\./,$next);
+                     &Apache::lonnet::appendparms(
+                     &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
+                      '___'.$resid.'___'.
+                     &Apache::lonnet::declutter($redirecturl),
+                     $hash{'param_'.$next});
+                  }
+              }
 # ----------------- The program must come past this point to untie the big hash
 	      untie(%hash);
 # --------------------------------------------------------- Store position info