--- rat/lonpageflip.pm	2000/10/11 21:16:29	1.6
+++ rat/lonpageflip.pm	2000/11/14 19:14:03	1.12
@@ -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 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,8 +61,44 @@ 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\//) {
+	 my $last;
+         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER,0640)) {
+	     $last=$hash{'last_known'};
+             untie(%hash);
+         }
+         if ($last) {
+	     $currenturl='/res/'.(split(/\_\_\_/,$last))[1];
+	 } else {
+	     $r->content_type('text/html');
+             $r->header_out(Location => 
+                               'http://'.$ENV{'HTTP_HOST'}.'/adm/noidea.html');
+             return REDIRECT;
+         }
+      }
 # ------------------------------------------- Do we have any idea where we are?
       my $position;
       if ($position=Apache::lonnet::symbread($currenturl)) {
@@ -122,7 +158,7 @@ sub handler {
 # -------------------------------------------------------------------------- Up
               } elsif ($direction eq 'down') {
 # ------------------------------------------------------------------------ Down
-              }
+	      }
 # ----------------------------------------------------- Check out possibilities
               if ($next) {
                   @possibilities=split(/\,/,$next);
@@ -131,6 +167,14 @@ 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;
@@ -144,6 +188,14 @@ 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 {
@@ -154,6 +206,7 @@ sub handler {
 	      untie(%hash);
 # --------------------------------------------------------- Store position info
               $cachehash{'last_direction'}=$direction;
+              $cachehash{'last_known'}=&Apache::lonnet::declutter($currenturl);
               &Apache::lonnet::symblist($mapurl,%cachehash);
 # ============================================== Do not return before this line
               if ($redirecturl) {
@@ -164,7 +217,43 @@ sub handler {
                   return REDIRECT;
 	      } else {
 # --------------------------------------------------------- There was a problem
-              }
+                  $r->content_type('text/html');
+                  $r->send_http_header;
+                  if ($#possibilities>0) {
+                     $r->print(<<ENDSTART);
+<head><title>Choose Next Location</title></head>
+<body bgcolor="#FFFFFF">
+<h1>LON-CAPA</h1>
+There are several possibilities of where to go next.
+<p>
+Please click on the the resource you intend to access:
+<p>
+<table border=2>
+<tr><th>Title</th><th>Type</th></tr>
+ENDSTART
+                     map {
+                        $r->print(
+                              '<tr><td><a href="'.
+                              $multichoicehash{'src_'.$_}.'">'.
+                              $multichoicehash{'title_'.$_}.
+                              '</a></td><td>'.$multichoicehash{'type_'.$_}.
+			      '</td></tr>');
+                     } @possibilities;
+                     $r->print('</table></body></html>');
+		     return OK;
+                  } else {
+                     $r->print(<<ENDNONE);
+<head><title>Choose Next Location</title></head>
+<body bgcolor="#FFFFFF">
+<img src="/adm/lonKaputt/lonlogo_broken.gif" align=left>
+<h1>Sorry!</h1>
+<h2>Next resource could not be identified.</h2>
+</body>
+</html>
+ENDNONE
+                     return OK;
+	         }
+	     }
 	  } else {
 # ------------------------------------------------- Problem, could not tie hash
               $ENV{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";