--- loncom/homework/structuretags.pm 2000/11/21 18:40:59 1.11 +++ loncom/homework/structuretags.pm 2000/11/29 00:51:57 1.17 @@ -29,17 +29,31 @@ 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); - push (@Apache::inputtags::part,'0'); - 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'; + 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') { + $result="\n"; + } else { + if ($Apache::inputtags::part ne '0') { + $result=&Apache::response::mandatory_part_meta; + } + } + return $result; } sub start_block { @@ -150,12 +164,14 @@ sub start_part { my $args =''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); - push (@Apache::inputtags::part,$id); + $Apache::inputtags::part=$id; + if ($target eq 'meta') { + return &Apache::response::mandatory_part_meta; + } } sub end_part { my ($target,$token,$parstack,$parser,$safeeval)=@_; - pop @Apache::inputtags::part; } 1;