--- loncom/homework/structuretags.pm 2000/11/29 00:51:57 1.17 +++ loncom/homework/structuretags.pm 2000/12/12 22:35:52 1.21 @@ -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,48 @@ sub end_tex { sub start_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; - unless ($target eq 'meta') { - my $args =''; - if ( $#$parstack > -1 ) { - $args=$$parstack[$#$parstack]; + +#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 ne 'meta') { + my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",'0'); + if ( !$passed ) { + my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); + if ( $target eq "web" ) { + return "Problem is not open to be viewed. It opens on $date"; + } } + } + if ($target eq 'web') { + # create a page header and exit + 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 "