--- rat/lonpageflip.pm	2000/10/09 19:37:35	1.4
+++ rat/lonpageflip.pm	2000/10/11 18:31:00	1.5
@@ -10,7 +10,7 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02 Gerd Kortemeyer)
 #
-# 10/03,10/05,10/06,10/07,10/09 Gerd Kortemeyer
+# 10/03,10/05,10/06,10/07,10/09,10/10,10/11 Gerd Kortemeyer
 
 package Apache::lonpageflip;
 
@@ -29,9 +29,9 @@ sub addrid {
     unless ($condid) { $condid=0; }
     if (&Apache::lonnet::allowed('bre',$hash{'src_'.$new})) {
 	if ($current) {
-	    $current.=','.$new.':'.$condid;
+	    $current.=','.$new;
         } else {
-            $current=''.$new.':'.$condid;
+            $current=''.$new;
         }
     }
     return $current;
@@ -50,7 +50,9 @@ sub handler {
      return OK;
   }
 
-  my %cachehash=();
+  my %cachehash=(); 
+  my $multichoice=0;
+  my %multichoicehash=();
   my $redirecturl='';
   my $next='';
   my @possibilities=();
@@ -59,7 +61,6 @@ sub handler {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
       my $currenturl=$2;
-      my $redirecturl=$currenturl;
       $currenturl=~s/^http\:\/\///;
       $currenturl=~s/^[^\/]+//;
 # ------------------------------------------- Do we have any idea where we are?
@@ -68,71 +69,114 @@ sub handler {
 # ------------------------------------------------------------------------- Yes
 	  my ($mapurl,$mapnum,$thisurl)=split(/\_\_\_/,$position);
           $cachehash{$thisurl}=$mapnum;
+# ============================================================ Tie the big hash
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                         &GDBM_READER,0640)) {
               my $rid=$hash{'map_pc_/res/'.$mapurl}.'.'.$mapnum;
               my $next='';
+              my $mincond=1;
+              my $posnext='';
               if ($direction eq 'forward') {
-                 map {
-		    $next=&addrid($next,$hash{'goesto_'.$_},
-                                  $hash{'condid_'.$hash{'undercond_'.$_}});
+# --------------------------------------------------------------------- Forward
+                  map {
+                      my $thiscond=
+      &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
+                      if ($thiscond>=$mincond) {
+		          if ($posnext) {
+		             $posnext.=','.$_.':'.$thiscond;
+                          } else {
+                             $posnext=$_.':'.$thiscond;
+		          }
+                          if ($thiscond>$mincond) { $mincond=$thiscond; }
+	              }
                   } split(/\,/,$hash{'to_'.$rid});
+                  map {
+                      my ($linkid,$condval)=split(/\:/,$_);
+                      if ($condval>=$mincond) {
+		          $next=&addrid($next,$hash{'goesto_'.$linkid},
+                                $hash{'condid_'.$hash{'undercond_'.$linkid}});
+                      }
+                  } split(/\,/,$posnext);
               } elsif ($direction eq 'back') {
-                map {
-		    $next=&addrid($next,$hash{'comesfrom_'.$_},
-                                  $hash{'condid_'.$hash{'undercond_'.$_}});
+# ------------------------------------------------------------------- Backwards
+                  map {
+                      my $thiscond=
+      &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
+                      if ($thiscond>=$mincond) {
+		          if ($posnext) {
+		             $posnext.=','.$_.':'.$thiscond;
+                          } else {
+                             $posnext=$_.':'.$thiscond;
+		          }
+                          if ($thiscond>$mincond) { $mincond=$thiscond; }
+	              }
                   } split(/\,/,$hash{'from_'.$rid});
+                  map {
+                      my ($linkid,$condval)=split(/\:/,$_);
+                      if ($condval>=$mincond) {
+		          $next=&addrid($next,$hash{'comesfrom_'.$linkid},
+                                $hash{'condid_'.$hash{'undercond_'.$linkid}});
+                      }
+                  } split(/\,/,$posnext);
  	      } elsif ($direction eq 'up') {
+# -------------------------------------------------------------------------- Up
               } elsif ($direction eq 'down') {
+# ------------------------------------------------------------------------ Down
               }
-              my $redirectid='';
 # ----------------------------------------------------- Check out possibilities
               if ($next) {
                   @possibilities=split(/\,/,$next);
                   if ($#possibilities==0) {
-		      $redirectid=(split(/\:/,$next))[0];
+# ---------------------------------------------- Only one possibility, redirect
+	              $redirecturl=$hash{'src_'.$next};
+                      $cachehash{&Apache::lonnet::declutter($redirecturl)}
+		                                 =(split(/\./,$next))[1];
                   } else {
+# ------------------------ There are multiple possibilities for a next resource
+                      $multichoice=1;
+                      map {
+			  $multichoicehash{'src_'.$_}=$hash{'src_'.$_};
+                          $multichoicehash{'title_'.$_}=$hash{'title_'.$_};
+                          $cachehash
+                            {&Apache::lonnet::declutter(
+						      $multichoicehash
+                                                         {'src_'.$_}
+                                                       )}
+		                                 =(split(/\./,$_))[1];
+                      } @possibilities;
                   }
-	      }
-              if ($redirectid) {
-		  $redirecturl=$hash{'src_'.$redirectid};
+	      } else {
+# -------------------------------------------------------------- No place to go
+                  $multichoice=-1;
               }
+# ----------------- The program must come past this point to untie the big hash
 	      untie(%hash);
+# --------------------------------------------------------- Store position info
+              $cachehash{'last_direction'}=$direction;
+              &Apache::lonnet::symblist($mapurl,%cachehash);
+# ============================================== Do not return before this line
               if ($redirecturl) {
+# ----------------------------------------------------- There is a URL to go to
 		  $r->content_type('text/html');
                   $r->header_out(Location => 
                                 'http://'.$ENV{'HTTP_HOST'}.$redirecturl);
                   return REDIRECT;
+	      } else {
+# --------------------------------------------------------- There was a problem
               }
+	  } else {
+# ------------------------------------------------- Problem, could not tie hash
+              $ENV{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";
+              return HTTP_NOT_ACCEPTABLE; 
           }
+      } else {
+# ---------------------------------------- No, could not determine where we are
       }
-# -------------------------------------------------------- No, could not decide
-      }
-    $r->content_type('text/html');
-     $r->send_http_header;
-
-  $r->print('<html><body>');
-
-# -------------------------- Class was not initialized or page fliped strangely
   } else {
+# -------------------------- Class was not initialized or page fliped strangely
       $ENV{'user.error.msg'}="/adm/flip:bre:0:0:Choose Course";
       return HTTP_NOT_ACCEPTABLE; 
   } 
-
-
-
-
-# ------TRASH BELOW
-# --------------------------- TRASH
-
-  $r->print('</body></html>');
-  return OK;
-
-
-# ========================================================= TOTAL TRASH
-
-#                  &Apache::lonnet::symblist($requrl,%symbhash);
-
 }
 
 1;