--- loncom/interface/lonnavmaps.pm 2002/08/21 17:18:08 1.43 +++ loncom/interface/lonnavmaps.pm 2002/09/02 18:25:55 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.43 2002/08/21 17:18:08 www Exp $ +# $Id: lonnavmaps.pm,v 1.45 2002/09/02 18:25:55 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -339,7 +339,7 @@ sub tracetable { my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_; my $newshowtypes=$showtypes; my $further=$sofar; - #$Apache::lonxml::debug=1; +# $Apache::lonxml::debug=1; &Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid}); if ($beenhere=~/\&$rid\&/) { return $further; } $beenhere.=$rid.'&'; @@ -491,13 +491,7 @@ sub handler { @rows=(); - &tracetable(0,$firstres,'&'.$lastres.'&','',0); - if ($hash{'src_'.$lastres}) { - my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$lastres}); - if (($brepriv eq '2') || ($brepriv eq 'F')) { - $rows[$#rows+1]=''.$lastres; - } - } + &tracetable(0,$firstres,'&','',0); # ------------------------------------------------------------------ Page parms @@ -613,10 +607,14 @@ sub handler { $r->print("\n"); my @colcont=split(/\&/,$rows[$i]); my $avespan=$lcm/($#colcont+1); + + # for each item I wish to print on this row... for ($j=0;$j<=$#colcont;$j++) { my $indent;my $indentstr; my $linkid; my $rid=$colcont[$j]; + + # bug? $rid can't accept a list of two elements $rid=~/(\d+)\.(\d+)$/; my $src= &Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2}); @@ -654,7 +652,7 @@ sub handler { } elsif ($code eq '4') { $add=''; } else { - $add=''; + $add=''; if ($tcode eq '2') { $add=''; }