--- loncom/homework/outputtags.pm 2002/10/16 20:42:22 1.21 +++ 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.21 2002/10/16 20:42:22 albertel Exp $ +# $Id: outputtags.pm,v 1.28 2003/05/02 19:11:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,7 @@ use Apache::lonnet; use POSIX qw(strftime); BEGIN { - &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle')); + &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight')); } sub initialize_outputtags { @@ -94,7 +94,7 @@ sub start_displaytitle { $result=&Apache::edit::tag_start($target,$token); $result.=''; $result.=&Apache::edit::end_table(); - } elsif ($target eq 'tex') { + } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $Apache::lonhomework::name=~s/%/\%/g; $Apache::lonhomework::name=~s/&/\&/g; $result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm'; @@ -106,6 +106,53 @@ sub end_displaytitle { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my @result; if ($target eq 'edit') { $result[1]='no'; } + return @result; +} + +sub start_displayweight { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if (exists($Apache::outputtags::showonce{'displayweight'})) { + 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; + 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.=''; + $result.=&Apache::edit::end_table(); + } + return $result; +} + +sub end_displayweight { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my @result; + if ($target eq 'edit') { $result[1]='no'; } return @result; }