--- rat/lonpageflip.pm	2000/10/17 10:36:17	1.8
+++ rat/lonpageflip.pm	2001/01/10 19:51:01	1.14
@@ -10,7 +10,9 @@
 # 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,11/16,
+# 10/01/01 Gerd Kortemeyer
 
 package Apache::lonpageflip;
 
@@ -61,6 +63,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 +98,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;
@@ -89,11 +111,15 @@ sub handler {
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER,0640)) {
               my $rid=$hash{'map_pc_/res/'.$mapurl}.'.'.$mapnum;
+
               my $next='';
               my $mincond=1;
               my $posnext='';
               if ($direction eq 'forward') {
 # --------------------------------------------------------------------- Forward
+                  if ($hash{'type_'.$rid} eq 'finish') {
+	             $rid=$hash{'ids_/res/'.$mapurl};
+                  }
                   map {
                       my $thiscond=
       &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
@@ -113,8 +139,18 @@ sub handler {
                                 $hash{'condid_'.$hash{'undercond_'.$linkid}});
                       }
                   } split(/\,/,$posnext);
+                  if ($hash{'is_map_'.$next}) {
+                      if (
+      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
+			  $mapurl=$hash{'src_'.$next};
+			  $next=$hash{'map_start_'.$hash{'src_'.$next}};
+                     }
+                  }
               } elsif ($direction eq 'back') {
 # ------------------------------------------------------------------- Backwards
+                  if ($hash{'type_'.$rid} eq 'start') {
+	             $rid=$hash{'ids_/res/'.$mapurl};
+                  }
                   map {
                       my $thiscond=
       &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
@@ -134,11 +170,18 @@ sub handler {
                                 $hash{'condid_'.$hash{'undercond_'.$linkid}});
                       }
                   } split(/\,/,$posnext);
+                  if ($hash{'is_map_'.$next}) {
+                      if (
+      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
+			  $mapurl=$hash{'src_'.$next};
+			  $next=$hash{'map_finish_'.$hash{'src_'.$next}};
+                     }
+                  }
  	      } elsif ($direction eq 'up') {
 # -------------------------------------------------------------------------- Up
               } elsif ($direction eq 'down') {
 # ------------------------------------------------------------------------ Down
-              }
+	      }
 # ----------------------------------------------------- Check out possibilities
               if ($next) {
                   @possibilities=split(/\,/,$next);