--- rat/lonpageflip.pm	2002/08/12 18:21:42	1.28
+++ rat/lonpageflip.pm	2003/03/08 01:39:29	1.37
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.28 2002/08/12 18:21:42 albertel 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; }
@@ -83,8 +92,8 @@ sub move {
               my $posnext='';
               if ($direction eq 'forward') {
 # --------------------------------------------------------------------- Forward
-                  if ($hash{'type_'.$rid} eq 'finish') {
-	             $rid=$hash{'ids_/res/'.$mapurl}; 
+                  while ($hash{'type_'.$rid} eq 'finish') {
+	             $rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}};
                   }
                   map {
                       my $thiscond=
@@ -119,9 +128,9 @@ sub move {
                   }
               } elsif ($direction eq 'back') {
 # ------------------------------------------------------------------- Backwards
-                  if ($hash{'type_'.$rid} eq 'start') {
-	             $rid=$hash{'ids_/res/'.$mapurl};
-                  }
+                 while ($hash{'type_'.$rid} eq 'start') {
+	             $rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}};
+		 }
                   map {
                       my $thiscond=
       &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
@@ -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='/res/'.(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,8 +219,10 @@ sub handler {
       }
       $currenturl=~s/^http\:\/\///;
       $currenturl=~s/^[^\/]+//;
-      unless (($currenturl=~/^\/res\//) || 
-              ($currenturl=~/^\/adm\/wrapper\//))  {
+#
+# 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)) {
@@ -211,7 +230,7 @@ sub handler {
              untie(%hash);
          }
          if ($last) {
-	     $currenturl='/res/'.(split(/\_\_\_/,$last))[1];
+	     $currenturl=&Apache::lonnet::clutter((split(/\_\_\_/,$last))[1]);
 	 } else {
 	     $r->content_type('text/html');
              $r->header_out(Location => 
@@ -231,7 +250,8 @@ sub handler {
 # ============================================================ Tie the big hash
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER(),0640)) {
-              my $rid=$hash{'map_pc_/res/'.$startoutmap}.'.'.$mapnum;
+              my $rid=$hash{'map_pc_'.&Apache::lonnet::clutter($startoutmap)}.
+                      '.'.$mapnum;
 
 # ------------------------------------------------- Move forward, backward, etc
               my $endupmap;
@@ -261,6 +281,12 @@ sub handler {
 			  $multichoicehash{'src_'.$_}=$hash{'src_'.$_};
                           $multichoicehash{'title_'.$_}=$hash{'title_'.$_};
                           $multichoicehash{'type_'.$_}=$hash{'type_'.$_};
+                          (my $first, my $second) = $_ =~ /(\d+).(\d+)/;
+                          my $symbSrc = Apache::lonnet::declutter($hash{'src_'.$_});
+                          $multichoicehash{'symb_'.$_} = 
+                              Apache::lonnet::declutter($hash{'map_id_'.$first}.'___'.
+                                                        $second.'___'.$symbSrc);
+                                                         
                           my ($choicemap,$choiceres)=split(/\./,$_);
                           $cachehash
 			 {&Apache::lonnet::declutter($hash{'src_'.$choicemap})}
@@ -285,6 +311,20 @@ sub handler {
 # ============================================== Do not return before this line
               if ($redirecturl) {
 # ----------------------------------------------------- There is a URL to go to
+# ------------------------------------------------- Check for critical messages
+		  if ((time-$ENV{'user.criticalcheck.time'})>300) {
+                     my @what=&Apache::lonnet::dump
+                                  ('critical',$ENV{'user.domain'},
+                                              $ENV{'user.name'});
+                     if ($what[0]) {
+	                if (($what[0] ne 'con_lost') && 
+                            ($what[0]!~/^error\:/)) {
+	                   $redirecturl='/adm/email?critical=display';
+                        }
+                     }
+                     &Apache::lonnet::appenv('user.criticalcheck.time'=>time);
+		  }
+
 		  $r->content_type('text/html');
                   $r->header_out(Location => 
                                 'http://'.$ENV{'HTTP_HOST'}.$redirecturl);
@@ -294,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>
@@ -308,7 +349,8 @@ ENDSTART
                      foreach (@possibilities) {
                         $r->print(
                               '<tr><td><a href="'.
-                              $multichoicehash{'src_'.$_}.'">'.
+                              $multichoicehash{'src_'.$_}.'?symb=' .
+                                  Apache::lonnet::escape($multichoicehash{'symb_'.$_}).'">'.
                               $multichoicehash{'title_'.$_}.
                               '</a></td><td>'.$multichoicehash{'type_'.$_}.
 			      '</td></tr>');
@@ -316,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