--- rat/lonpageflip.pm	2001/07/05 19:38:23	1.17
+++ rat/lonpageflip.pm	2002/04/11 01:57:36	1.19
@@ -2,6 +2,30 @@
 #
 # Page flip handler
 #
+# $Id: lonpageflip.pm,v 1.19 2002/04/11 01:57:36 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
@@ -181,7 +205,7 @@ sub handler {
       if ($position=Apache::lonnet::symbread($currenturl)) {
 # ------------------------------------------------------------------------- Yes
 	  my ($mapurl,$mapnum,$thisurl)=split(/\_\_\_/,$position);
-          $cachehash{$thisurl}=$mapnum;
+          $cachehash{$mapurl}{$thisurl}=$mapnum;
 # ============================================================ Tie the big hash
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER,0640)) {
@@ -203,7 +227,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
@@ -212,7 +237,7 @@ sub handler {
 			  $multichoicehash{'src_'.$_}=$hash{'src_'.$_};
                           $multichoicehash{'title_'.$_}=$hash{'title_'.$_};
                           $multichoicehash{'type_'.$_}=$hash{'type_'.$_};
-                          $cachehash
+                          $cachehash{$mapurl}
                             {&Apache::lonnet::declutter(
 						      $multichoicehash
                                                          {'src_'.$_}
@@ -227,9 +252,12 @@ 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;
+              $cachehash{$mapurl}{'last_known'}=
+                                       &Apache::lonnet::declutter($currenturl);
+              foreach my $thismap (keys %cachehash) {
+                 &Apache::lonnet::symblist($thismap,%{$cachehash{$thisurl}});
+	      }
 # ============================================== Do not return before this line
               if ($redirecturl) {
 # ----------------------------------------------------- There is a URL to go to