--- rat/lonpageflip.pm	2002/12/06 14:06:53	1.33
+++ rat/lonpageflip.pm	2003/03/08 01:39:29	1.37
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.33 2002/12/06 14:06:53 www Exp $
+# $Id: lonpageflip.pm,v 1.37 2003/03/08 01:39:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,15 @@ use GDBM_File;
   
 my %hash;
 
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup pageflip: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup pageflip: hash');
+        }
+    }
+}
+
 sub addrid {
     my ($current,$new,$condid)=@_;
     unless ($condid) { $condid=0; }
@@ -176,6 +185,7 @@ sub handler {
   my $redirecturl='';
   my $next='';
   my @possibilities=();
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
   if (($ENV{'form.postdata'})&&($ENV{'request.course.fn'})) {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
@@ -189,8 +199,15 @@ sub handler {
              untie(%hash);
          }
          my $newloc;
-         if ($last) {
-            $newloc=&Apache::lonnet::clutter((split(/\_\_\_/,$last))[1]);
+         if (($last) && (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                        &GDBM_READER(),0640))) {
+            my ($murl,$fn)=split(/\_\_\_/,$last);
+            my $id;
+            ($murl,$id,$fn)=split(/\_\_\_/,&Apache::lonnet::symbread($fn));
+	    $newloc=$hash{'src_'.
+                $hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id};
+            unless ($newloc) { $newloc='/adm/noidea.html'; }
+            untie %hash;
          } else {
 	    $newloc='/adm/noidea.html';
          }  
@@ -202,7 +219,10 @@ sub handler {
       }
       $currenturl=~s/^http\:\/\///;
       $currenturl=~s/^[^\/]+//;
-      unless ($currenturl=~/^\/(res|adm\/wrapper|public|adm\/coursedocs)\//) {
+#
+# Is the current URL on the map? If not, start with last known URL
+#
+      unless (&Apache::lonnet::is_on_map($currenturl)) {
 	 my $last;
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                     &GDBM_READER(),0640)) {
@@ -314,11 +334,12 @@ sub handler {
                   $r->content_type('text/html');
                   $r->send_http_header;
                   if ($#possibilities>0) {
+		      my $bodytag=
+                             &Apache::loncommon::bodytag('Multiple Resources');
                      $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.
+$bodytag
+<h3>There are several possibilities of where to go next</h3>
 <p>
 Please click on the the resource you intend to access:
 <p>
@@ -337,13 +358,17 @@ ENDSTART
                      $r->print('</table></body></html>');
 		     return OK;
                   } else {
+		      my $bodytag=&Apache::loncommon::bodytag('No Resource');
                      $r->print(<<ENDNONE);
-<head><title>Choose Next Location</title></head>
-<body bgcolor="#FFFFFF">
-<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>
+<head><title>No Resource</title></head>
+$bodytag
+<h3>Next resource could not be identified.</h3>
+<p>You probably are at the <b>beginning</b> or the <b>end</b> of the 
+course.</p>
+<ul>
+<li><a href="/adm/flip?postdata=return:">Go Back</a></li>
+<li><a href="/adm/navmaps">Navigate Course Content</a></li>
+</ul>
 </body>
 </html>
 ENDNONE
