--- loncom/homework/structuretags.pm 2000/10/12 20:36:05 1.10 +++ loncom/homework/structuretags.pm 2000/12/01 00:44:48 1.18 @@ -6,13 +6,7 @@ use strict; use Apache::lonnet; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','outtext','web','tex')); -} - -sub start_outtext { -} - -sub end_outtext { + &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part')); } sub start_web { @@ -35,16 +29,35 @@ sub end_tex { sub start_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $args =''; - if ( $#$parstack > -1 ) { - $args=$$parstack[$#$parstack]; - } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - return "$name\n\n" + unless ($target eq 'meta') { + my $args =''; + if ( $#$parstack > -1 ) { + $args=$$parstack[$#$parstack]; + } + my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + $Apache::inputtags::part='0'; + @Apache::inputtags::responselist = (); + my $expression='$external::part='.$Apache::inputtags::part.';'; + $safeeval->share_from('Apache::inputtags',['@part']); + &Apache::run::run($expression,$safeeval); + return "$name\n\n
"; + } } sub end_problem { - return "\n"; + my ($target,$token,$parstack,$parser,$safeeval)=@_; + my $result=''; + unless ($target eq 'meta') { + if ( $target eq 'web' && $Apache::inputtags::part eq '0') { + $result.=&Apache::inputtags::grade; + } + $result.="
\n"; + } else { + if ($Apache::inputtags::part eq '0') { + $result=&Apache::response::mandatory_part_meta; + } + } + return $result; } sub start_block { @@ -150,6 +163,27 @@ sub shuffle { sub end_randomlist { } +sub start_part { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + my $args =''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); + $Apache::inputtags::part=$id; + @Apache::inputtags::responselist = (); + if ($target eq 'meta') { + return &Apache::response::mandatory_part_meta; + } +} + +sub end_part { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + &Apache::lonxml::debug("in end_part $target "); + if ( $target eq 'meta' ) { + return ''; + } + my $result=&Apaceh::inputtags::grade; + return $result; +} 1; __END__