--- rat/lonpageflip.pm	2002/04/12 14:24:58	1.24
+++ rat/lonpageflip.pm	2003/03/01 15:13:59	1.35
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.24 2002/04/12 14:24:58 www Exp $
+# $Id: lonpageflip.pm,v 1.35 2003/03/01 15:13:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,19 +50,38 @@ 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; }
-    if (&Apache::lonnet::allowed('bre',$hash{'src_'.$new})) {
+
 	if ($current) {
 	    $current.=','.$new;
         } else {
             $current=''.$new;
         }
-    }
+
     return $current;
 }
 
+sub fullmove {
+    my ($rid,$mapurl,$direction)=@_;
+    if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                        &GDBM_READER(),0640)) {
+	($rid,$mapurl)=&move($rid,$mapurl,$direction);
+        untie(%hash);
+    }
+    return($rid,$mapurl);
+}
+
 sub move {
     my ($rid,$mapurl,$direction)=@_;
     my $startoutrid=$rid;
@@ -73,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=
@@ -109,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_'.$_}});
@@ -174,13 +193,13 @@ sub handler {
 # -------------------------------------------------------- Return to last known
          my $last;
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                    &GDBM_READER,0640)) {
+                    &GDBM_READER(),0640)) {
 	     $last=$hash{'last_known'};
              untie(%hash);
          }
          my $newloc;
          if ($last) {
-            $newloc='/res/'.(split(/\_\_\_/,$last))[1];
+            $newloc=&Apache::lonnet::clutter((split(/\_\_\_/,$last))[1]);
          } else {
 	    $newloc='/adm/noidea.html';
          }  
@@ -192,16 +211,18 @@ 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)) {
+                    &GDBM_READER(),0640)) {
 	     $last=$hash{'last_known'};
              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 => 
@@ -220,16 +241,18 @@ 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;
+                        &GDBM_READER(),0640)) {
+              my $rid=$hash{'map_pc_'.&Apache::lonnet::clutter($startoutmap)}.
+                      '.'.$mapnum;
 
 # ------------------------------------------------- Move forward, backward, etc
               my $endupmap;
               ($next,$endupmap)=&move($rid,$startoutmap,$direction);
 # -------------------------------------- Do we have one and only one empty URL?
               my $safecount=0;
-              while (($next) && ($next!~/\,/) && (!$hash{'src_'.$next})
-                     && ($safecount<25)) {
+              while (($next) && ($next!~/\,/) && 
+                     ((!$hash{'src_'.$next}) || ($hash{'randomout_'.$next}))
+                     && ($safecount<10000)) {
                   ($next,$endupmap)=&move($next,$endupmap,$direction);
                   $safecount++;
               }
@@ -250,6 +273,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})}
@@ -274,6 +303,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,14 +337,15 @@ Please click on the the resource you int
 <table border=2>
 <tr><th>Title</th><th>Type</th></tr>
 ENDSTART
-                     map {
+                     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>');
-                     } @possibilities;
+                     }
                      $r->print('</table></body></html>');
 		     return OK;
                   } else {