--- loncom/homework/structuretags.pm 2000/12/01 00:44:48 1.18 +++ loncom/homework/structuretags.pm 2000/12/04 21:51:30 1.19 @@ -12,7 +12,10 @@ sub BEGIN { sub start_web { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); - return $bodytext; + if ($target eq 'web') { + return $bodytext; + } + return ''; } sub end_web { @@ -21,6 +24,9 @@ sub end_web { sub start_tex { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); + if ($target eq 'tex') { + return $bodytext + } return ''; } @@ -29,29 +35,38 @@ sub end_tex { sub start_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; - unless ($target eq 'meta') { + +#intialize globals + $Apache::inputtags::part='0'; + @Apache::inputtags::responselist = (); + +#adeed vars to the scripting enviroment + my $expression='$external::part='.$Apache::inputtags::part.';'; + &Apache::run::run($expression,$safeeval); + + if ($target eq 'web') { + # create a page header and exit my $args =''; - if ( $#$parstack > -1 ) { - $args=$$parstack[$#$parstack]; - } + 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 "