--- rat/lonpage.pm	2000/10/02 21:33:40	1.10
+++ rat/lonpage.pm	2000/10/10 20:34:09	1.11
@@ -5,7 +5,7 @@
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
 # 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/02,10/10 Gerd Kortemeyer
 
 package Apache::lonpage;
 
@@ -74,10 +74,28 @@ sub tracetable {
        }
 
        if (defined($hash{'to_'.$rid})) {
+	  my $mincond=1;
+          my $next='';
           map {
-              my $now=&tracetable($sofar,$hash{'goesto_'.$_},$beenhere);
-              if ($now>$further) { $further=$now; }
+              my $thiscond=
+      &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
+              if ($thiscond>=$mincond) {
+		  if ($next) {
+		      $next.=','.$_.':'.$thiscond;
+                  } else {
+                      $next=$_.':'.$thiscond;
+		  }
+                  if ($thiscond>$mincond) { $mincond=$thiscond; }
+	      }
           } split(/\,/,$hash{'to_'.$rid});
+          map {
+              my ($linkid,$condval)=split(/\:/,$_);
+              if ($condval>=$mincond) {
+                my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
+                if ($now>$further) { $further=$now; }
+	      }
+          } split(/\,/,$next);
+
        }
     }
     return $further;