--- rat/lonpageflip.pm	2003/08/15 14:49:26	1.40
+++ rat/lonpageflip.pm	2004/04/08 09:14:41	1.47
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.40 2003/08/15 14:49:26 www Exp $
+# $Id: lonpageflip.pm,v 1.47 2004/04/08 09:14:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,6 +120,10 @@ sub move {
       $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
 			  $mapurl=$hash{'src_'.$next};
 			  $next=$hash{'map_start_'.$hash{'src_'.$next}};
+                     } elsif (
+# This jumps back up from an empty sequence, to a page up one level
+                         $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'page') {
+                         $mapurl=$hash{'map_id_'.(split(/\./,$next))[0]};
                      }
                   } elsif 
                     ((split(/\./,$startoutrid))[0]!=(split(/\./,$next))[0]) {
@@ -156,7 +160,11 @@ sub move {
       $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
 			  $mapurl=$hash{'src_'.$next};
 			  $next=$hash{'map_finish_'.$hash{'src_'.$next}};
-                     }
+                      } elsif (
+      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'page') {
+# This jumps back up from an empty sequence, to a page up one level
+                          $mapurl=$hash{'map_id_'.(split(/\./,$next))[0]};
+                      }
                   } elsif 
                     ((split(/\./,$startoutrid))[0]!=(split(/\./,$next))[0]) {
 # This comes back up from a map (going up one level);
@@ -190,6 +198,7 @@ sub handler {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
       my $currenturl=$2;
+      $currenturl=~s/\.\d+\.(\w+)$/\.$1/;
       if ($direction eq 'return') {
 # -------------------------------------------------------- Return to last known
          my $last;
@@ -201,9 +210,9 @@ sub handler {
          my $newloc;
          if (($last) && (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER(),0640))) {
-            my ($murl,$fn)=split(/\_\_\_/,$last);
+            my ($murl,$fn)=&Apache::lonnet::decode_symb($last);
             my $id;
-            ($murl,$id,$fn)=split(/\_\_\_/,&Apache::lonnet::symbread($fn));
+            ($murl,$id,$fn)=&Apache::lonnet::decode_symb(&Apache::lonnet::symbread($fn));
 	    $newloc=$hash{'src_'.
                 $hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id};
             unless ($newloc) { $newloc='/adm/noidea.html'; }
@@ -230,7 +239,7 @@ sub handler {
              untie(%hash);
          }
          if ($last) {
-	     $currenturl=&Apache::lonnet::clutter((split(/\_\_\_/,$last))[1]);
+	     $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[1]);
 	 } else {
 	     $r->content_type('text/html');
              $r->header_out(Location => 
@@ -242,7 +251,7 @@ sub handler {
       my $position;
       if ($position=Apache::lonnet::symbread($currenturl)) {
 # ------------------------------------------------------------------------- Yes
-	  my ($startoutmap,$mapnum,$thisurl)=split(/\_\_\_/,$position);
+	  my ($startoutmap,$mapnum,$thisurl)=&Apache::lonnet::decode_symb($position);
           $cachehash{$startoutmap}{$thisurl}=$mapnum;
           $cachehash{$startoutmap}{'last_known'}=
                                        &Apache::lonnet::declutter($currenturl);
@@ -388,7 +397,10 @@ ENDNONE
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-         $r->internal_redirect('/adm/ambiguous');
+	  if ( &Apache::lonnet::mod_perl_version() == 2 ) {
+	      &Apache::lonnet::cleanenv();
+	  }
+	  $r->internal_redirect('/adm/ambiguous');
       }
   } else {
 # -------------------------- Class was not initialized or page fliped strangely