--- loncom/interface/lonnavmaps.pm 2003/07/25 01:18:04 1.218 +++ loncom/interface/lonnavmaps.pm 2003/07/29 05:22:56 1.219 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.218 2003/07/25 01:18:04 bowersj2 Exp $ +# $Id: lonnavmaps.pm,v 1.219 2003/07/29 05:22:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2027,7 +2027,7 @@ sub parmval { sub parmval_real { my $self = shift; - my ($what,$symb) = @_; + my ($what,$symb,$recurse) = @_; my $cid=$ENV{'request.course.id'}; my $csec=$ENV{'request.course.sec'}; @@ -2099,9 +2099,12 @@ sub parmval_real { my $id=pop(@parts); my $part=join('_',@parts); if ($part eq '') { $part='0'; } - my $partgeneral=$self->parmval($part.".$qualifier",$symb); + my $partgeneral=$self->parmval($part.".$qualifier",$symb,1); if (defined($partgeneral)) { return $partgeneral; } } + if ($recurse) { return undef; } + my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$what); + if (defined($pack_def)) { return $pack_def; } return ''; }