--- rat/lonpageflip.pm	2001/05/03 15:54:06	1.15
+++ rat/lonpageflip.pm	2002/04/11 18:19:46	1.21
@@ -2,6 +2,30 @@
 #
 # Page flip handler
 #
+# $Id: lonpageflip.pm,v 1.21 2002/04/11 18:19:46 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Page Handler
 #
 # (TeX Content Handler
@@ -12,7 +36,7 @@
 #
 # 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,05/01 Gerd Kortemeyer
+# 10/01/01,05/01,05/28,07/05 Gerd Kortemeyer
 
 package Apache::lonpageflip;
 
@@ -108,10 +132,6 @@ sub move {
 			  $next=$hash{'map_finish_'.$hash{'src_'.$next}};
                      }
                   }
- 	      } elsif ($direction eq 'up') {
-# -------------------------------------------------------------------------- Up
-              } elsif ($direction eq 'down') {
-# ------------------------------------------------------------------------ Down
 	      }
 
               return ($next,$mapurl);
@@ -136,7 +156,6 @@ sub handler {
   my $redirecturl='';
   my $next='';
   my @possibilities=();
-
   if (($ENV{'form.postdata'})&&($ENV{'request.course.fn'})) {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
@@ -163,7 +182,8 @@ sub handler {
       }
       $currenturl=~s/^http\:\/\///;
       $currenturl=~s/^[^\/]+//;
-      unless ($currenturl=~/\/res\//) {
+      unless (($currenturl=~/^\/res\//) || 
+              ($currenturl=~/^\/adm\/wrapper\//))  {
 	 my $last;
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                     &GDBM_READER,0640)) {
@@ -184,7 +204,10 @@ sub handler {
       if ($position=Apache::lonnet::symbread($currenturl)) {
 # ------------------------------------------------------------------------- Yes
 	  my ($mapurl,$mapnum,$thisurl)=split(/\_\_\_/,$position);
-          $cachehash{$thisurl}=$mapnum;
+          $cachehash{$mapurl}{$thisurl}=$mapnum;
+          $cachehash{$mapurl}{'last_known'}=&Apache::lonnet::declutter($currenturl);
+          my $startoutmap=$mapurl;
+
 # ============================================================ Tie the big hash
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER,0640)) {
@@ -206,7 +229,8 @@ sub handler {
                   if ($#possibilities==0) {
 # ---------------------------------------------- Only one possibility, redirect
 	              $redirecturl=$hash{'src_'.$next};
-                      $cachehash{&Apache::lonnet::declutter($redirecturl)}
+                      $cachehash{$mapurl}
+                                {&Apache::lonnet::declutter($redirecturl)}
 		                                 =(split(/\./,$next))[1];
                   } else {
 # ------------------------ There are multiple possibilities for a next resource
@@ -215,7 +239,7 @@ sub handler {
 			  $multichoicehash{'src_'.$_}=$hash{'src_'.$_};
                           $multichoicehash{'title_'.$_}=$hash{'title_'.$_};
                           $multichoicehash{'type_'.$_}=$hash{'type_'.$_};
-                          $cachehash
+                          $cachehash{$mapurl}
                             {&Apache::lonnet::declutter(
 						      $multichoicehash
                                                          {'src_'.$_}
@@ -230,9 +254,10 @@ sub handler {
 # ----------------- The program must come past this point to untie the big hash
 	      untie(%hash);
 # --------------------------------------------------------- Store position info
-              $cachehash{'last_direction'}=$direction;
-              $cachehash{'last_known'}=&Apache::lonnet::declutter($currenturl);
-              &Apache::lonnet::symblist($mapurl,%cachehash);
+              $cachehash{$mapurl}{'last_direction'}=$direction;
+              foreach my $thismap (keys %cachehash) {
+                 &Apache::lonnet::symblist($thismap,%{$cachehash{$thismap}});
+	      }
 # ============================================== Do not return before this line
               if ($redirecturl) {
 # ----------------------------------------------------- There is a URL to go to
@@ -270,9 +295,10 @@ ENDSTART
                      $r->print(<<ENDNONE);
 <head><title>Choose Next Location</title></head>
 <body bgcolor="#FFFFFF">
-<img src="/adm/lonKaputt/lonlogo_broken.gif" align=left>
+<img src="/adm/lonIcons/lonlogos.gif" align=right>
 <h1>Sorry!</h1>
 <h2>Next resource could not be identified.</h2>
+<h3>You probably are at the beginning or the end of the course.</h3>
 </body>
 </html>
 ENDNONE