--- loncom/homework/outputtags.pm 2003/01/13 21:23:06 1.25 +++ loncom/homework/outputtags.pm 2003/05/02 19:11:12 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # tags that create controlled output # -# $Id: outputtags.pm,v 1.25 2003/01/13 21:23:06 sakharuk Exp $ +# $Id: outputtags.pm,v 1.28 2003/05/02 19:11:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -113,17 +113,34 @@ sub start_displayweight { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if (exists($Apache::outputtags::showonce{'displayweight'})) { - return ''; - } else { - $Apache::outputtags::showonce{'displayweight'}=1; + if(grep(/^\Q$Apache::inputtags::part\E$/, + @{$Apache::outputtags::showonce{'displayweight'}})) { + return ''; + } } + push(@{$Apache::outputtags::showonce{'displayweight'}}, + $Apache::inputtags::part); 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 $metadata = &Apache::lonnet::metadata($ENV{'request.uri'}, + 'packages'); + 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; + } + } + $result=$weight; + } } elsif ( $target eq 'edit' ) { $result=&Apache::edit::tag_start($target,$token); $result.='';