--- rat/lonpageflip.pm	2000/11/14 19:14:03	1.12
+++ 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,11/14 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;
 
@@ -109,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_'.$_}});
@@ -133,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_'.$_}});
@@ -154,6 +170,13 @@ 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') {
@@ -167,14 +190,6 @@ sub handler {
 	              $redirecturl=$hash{'src_'.$next};
                       $cachehash{&Apache::lonnet::declutter($redirecturl)}
 		                                 =(split(/\./,$next))[1];
-		      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});
-                      }
                   } else {
 # ------------------------ There are multiple possibilities for a next resource
                       $multichoice=1;
@@ -188,14 +203,6 @@ sub handler {
                                                          {'src_'.$_}
                                                        )}
 		                                 =(split(/\./,$_))[1];
-                          if ($hash{'param_'.$_}) {
-        		     my ($mapid,$resid)=split(/\./,$_);
-                             &Apache::lonnet::appendparms(
-                           &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
-                           '___'.$resid.'___'.
-                           &Apache::lonnet::declutter($hash{'src_'.$_}),
-                             $hash{'param_'.$_});
-			  }
                       } @possibilities;
                   }
 	      } else {