--- loncom/homework/outputtags.pm 2003/05/02 19:11:12 1.28 +++ loncom/homework/outputtags.pm 2003/05/03 21:09:03 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # tags that create controlled output # -# $Id: outputtags.pm,v 1.28 2003/05/02 19:11:12 albertel Exp $ +# $Id: outputtags.pm,v 1.29 2003/05/03 21:09:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -109,6 +109,20 @@ sub end_displaytitle { return @result; } +sub multipart { + my ($uri)=@_; + if (!defined($uri)) { $uri=$ENV{'request.uri'}; } + my @parts; + my $metadata = &Apache::lonnet::metadata($uri,'packages'); + foreach (split(/\,/,$metadata)) { + if ($_ =~ /^part_(.*)$/) { + my $part = $1; + if ($part ne '0') { push(@parts,$part); } + } + } + return @parts; +} + sub start_displayweight { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -128,16 +142,12 @@ sub start_displayweight { if (!defined($weight) || ($weight eq '')) { $weight=1; } $result.=$weight; } else { - my $metadata = &Apache::lonnet::metadata($ENV{'request.uri'}, - 'packages'); + my @parts=&multipart($ENV{'request.uri'}); my $weight; - foreach (split(/\,/,$metadata)) { - if ($_ =~ /^part_(.*)$/) { - my $part = $1; - my $pweight=&Apache::lonnet::EXT("resource.$part.weight"); - if (!defined($pweight) || ($pweight eq '')) { $pweight=1; } - $weight+=$pweight; - } + foreach my $part (@parts) { + my $pweight=&Apache::lonnet::EXT("resource.$part.weight"); + if (!defined($pweight) || ($pweight eq '')) { $pweight=1; } + $weight+=$pweight; } $result=$weight; }