--- loncom/homework/structuretags.pm 2000/11/29 00:51:57 1.17 +++ loncom/homework/structuretags.pm 2000/12/15 20:31:30 1.22 @@ -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,27 +35,62 @@ 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); + my $status; + my $datemsg; + if ($target ne 'meta') { + ($status,$datemsg) = &Apache::lonhomework::check_date('0'); + push (@Apache::inputtags::status,$status); + if ( $status eq 'CLOSED' ) { + my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); + if ( $target eq "web" ) { + return "Problem is not open to be viewed. The problem $datemsg"; + } + } + } + if ($target eq 'web') { 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'; - my $expression='$external::part='.$Apache::inputtags::part.';'; - $safeeval->share_from('Apache::inputtags',['@part']); - &Apache::run::run($expression,$safeeval); - return "