--- loncom/homework/structuretags.pm 2000/12/12 22:35:52 1.21 +++ loncom/homework/structuretags.pm 2000/12/15 20:31:30 1.22 @@ -43,28 +43,36 @@ sub start_problem { #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') { - my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",'0'); - if ( !$passed ) { + ($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. It opens on $date"; + return "Problem is not open to be viewed. The problem $datemsg"; } - } + } } 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); - return "$name\n\n
"; - } + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + return "$name\n\n"; + } elsif ($status eq 'SHOW_ANSWER') { + return "$name\n\n"; + } + } return ''; } sub end_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $result=''; + my $status=@Apache::inputtags::status['-1']; unless ($target eq 'meta') { if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading @@ -74,7 +82,13 @@ sub end_problem { # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); } - if ($target eq 'web') { $result.="\n"; } + if ($target eq 'web') { + if ($status eq 'CAN_ANSWER') { + $result.="\n"; + } elsif ($status eq 'SHOW_ANSWER') { + $result.="\n"; + } + } } else { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta;