--- loncom/homework/outputtags.pm 2002/10/16 20:42:22 1.21 +++ loncom/homework/outputtags.pm 2003/01/13 21:23:06 1.25 @@ -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.25 2003/01/13 21:23:06 sakharuk 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,36 @@ 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'})) { + return ''; + } else { + $Apache::outputtags::showonce{'displayweight'}=1; + } + 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; + } 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; }