--- loncom/homework/outputtags.pm 2003/05/02 18:56:29 1.26 +++ loncom/homework/outputtags.pm 2003/07/01 21:10:43 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # tags that create controlled output # -# $Id: outputtags.pm,v 1.26 2003/05/02 18:56:29 albertel Exp $ +# $Id: outputtags.pm,v 1.30 2003/07/01 21:10:43 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; @@ -123,10 +137,25 @@ sub start_displayweight { my $status=$Apache::inputtags::status['-1']; if ($target eq 'web' || $target eq 'tex') { my $id = $Apache::inputtags::part; - my $weight = &Apache::lonnet::EXT("resource.$id.weight"); - &Apache::lonxml::debug("duedatebox found $weight for $id"); - if (!defined($weight) || ($weight eq '')) { $weight=1; } - $result.=$weight; + if ($id ne '0') { + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + if (!defined($weight) || ($weight eq '')) { $weight=1; } + $result.=$weight; + } else { + my @parts=&multipart($ENV{'request.uri'}); + my $weight; + if (@parts) { + foreach my $part (@parts) { + my $pweight=&Apache::lonnet::EXT("resource.$part.weight"); + if (!defined($pweight) || ($pweight eq '')) { $pweight=1; } + $weight+=$pweight; + } + } else { + $weight = &Apache::lonnet::EXT("resource.$id.weight"); + if (!defined($weight) || ($weight eq '')) { $weight=1; } + } + $result=$weight; + } } elsif ( $target eq 'edit' ) { $result=&Apache::edit::tag_start($target,$token); $result.='';