--- rat/lonpageflip.pm	2001/01/10 19:51:01	1.14
+++ rat/lonpageflip.pm	2001/05/03 15:54:06	1.15
@@ -12,7 +12,7 @@
 #
 # 10/03,10/05,10/06,10/07,10/09,10/10,10/11,10/16,10/17,
 # 11/14,11/16,
-# 10/01/01 Gerd Kortemeyer
+# 10/01/01,05/01 Gerd Kortemeyer
 
 package Apache::lonpageflip;
 
@@ -39,6 +39,84 @@ sub addrid {
     return $current;
 }
 
+sub move {
+    my ($rid,$mapurl,$direction)=@_;
+
+    my $next='';
+
+              my $mincond=1;
+              my $posnext='';
+              if ($direction eq 'forward') {
+# --------------------------------------------------------------------- Forward
+                  if ($hash{'type_'.$rid} eq 'finish') {
+	             $rid=$hash{'ids_/res/'.$mapurl}; 
+                  }
+                  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);
+                  if ($hash{'is_map_'.$next}) {
+                      if (
+      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
+			  $mapurl=$hash{'src_'.$next};
+			  $next=$hash{'map_start_'.$hash{'src_'.$next}};
+                     }
+                  }
+              } elsif ($direction eq 'back') {
+# ------------------------------------------------------------------- Backwards
+                  if ($hash{'type_'.$rid} eq 'start') {
+	             $rid=$hash{'ids_/res/'.$mapurl};
+                  }
+                  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);
+                  if ($hash{'is_map_'.$next}) {
+                      if (
+      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
+			  $mapurl=$hash{'src_'.$next};
+			  $next=$hash{'map_finish_'.$hash{'src_'.$next}};
+                     }
+                  }
+ 	      } elsif ($direction eq 'up') {
+# -------------------------------------------------------------------------- Up
+              } elsif ($direction eq 'down') {
+# ------------------------------------------------------------------------ Down
+	      }
+
+              return ($next,$mapurl);
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -112,76 +190,16 @@ sub handler {
                         &GDBM_READER,0640)) {
               my $rid=$hash{'map_pc_/res/'.$mapurl}.'.'.$mapnum;
 
-              my $next='';
-              my $mincond=1;
-              my $posnext='';
-              if ($direction eq 'forward') {
-# --------------------------------------------------------------------- Forward
-                  if ($hash{'type_'.$rid} eq 'finish') {
-	             $rid=$hash{'ids_/res/'.$mapurl};
-                  }
-                  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);
-                  if ($hash{'is_map_'.$next}) {
-                      if (
-      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
-			  $mapurl=$hash{'src_'.$next};
-			  $next=$hash{'map_start_'.$hash{'src_'.$next}};
-                     }
-                  }
-              } elsif ($direction eq 'back') {
-# ------------------------------------------------------------------- Backwards
-                  if ($hash{'type_'.$rid} eq 'start') {
-	             $rid=$hash{'ids_/res/'.$mapurl};
-                  }
-                  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);
-                  if ($hash{'is_map_'.$next}) {
-                      if (
-      $hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$next}}} eq 'sequence') {
-			  $mapurl=$hash{'src_'.$next};
-			  $next=$hash{'map_finish_'.$hash{'src_'.$next}};
-                     }
-                  }
- 	      } elsif ($direction eq 'up') {
-# -------------------------------------------------------------------------- Up
-              } elsif ($direction eq 'down') {
-# ------------------------------------------------------------------------ Down
-	      }
+# ------------------------------------------------- Move forward, backward, etc
+
+              ($next,$mapurl)=&move($rid,$mapurl,$direction);
+# -------------------------------------- Do we have one and only one empty URL?
+              my $safecount=0;
+              while (($next) && ($next!~/\,/) && (!$hash{'src_'.$next})
+                     && ($safecount<25)) {
+                  ($next,$mapurl)=&move($next,$mapurl,$direction);
+                  $safecount++;
+              }
 # ----------------------------------------------------- Check out possibilities
               if ($next) {
                   @possibilities=split(/\,/,$next);