--- loncom/homework/structuretags.pm 2000/11/28 20:11:25 1.15 +++ loncom/homework/structuretags.pm 2000/12/29 21:54:06 1.25 @@ -6,13 +6,16 @@ use strict; use Apache::lonnet; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part')); + &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved')); } 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,24 +35,69 @@ sub end_tex { sub start_problem { my ($target,$token,$parstack,$parser,$safeeval)=@_; - unless ($target eq 'meta') { - my $args =''; - if ( $#$parstack > -1 ) { - $args=$$parstack[$#$parstack]; - } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + +#intialize globals $Apache::inputtags::part='0'; + @Apache::inputtags::responselist = (); + +#adeed vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; - $safeeval->share_from('Apache::inputtags',['@part']); - &Apache::run::run($expression); - return "$name\n\n
"; -} else { - return &Apache::response::mandatory_part_meta; -} + &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); + my $expression='$external::datestatus="'.$status.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; + &Apache::run::run($expression,$safeeval); + 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]; } + my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + 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 { - return "
\n"; + 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 + &Apache::inputtags::grade; + } elsif ($Apache::inputtags::part eq '0') { + # if part is zero, no s existed, so we need show the current + # grading status + $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); + } + 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; + } + } + return $result; } sub start_block { @@ -57,10 +108,10 @@ sub start_block { $code .=';return $condition;'; # print "
$code
"; my $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); if ( ! $result ) { -# my $skip=$$parser[$#$parser]->get_text("/block"); my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); -# print "skipped $skip"; + &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); } return ""; } @@ -158,15 +209,92 @@ sub start_part { if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); $Apache::inputtags::part=$id; + @Apache::inputtags::responselist = (); if ($target eq 'meta') { - return &Apache::response::mandatory_part_meta; + return &Apache::response::mandatory_part_meta; + } else { + my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); + push (@Apache::inputtags::status,$status); + my $expression='$external::datestatus="'.$status.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; + &Apache::run::run($expression,$safeeval); + if ( $status eq 'CLOSED' ) { + my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); + if ( $target eq "web" ) { + return "

Part is not open to be viewed. It $datemsg

"; + } + } } + return ''; } sub end_part { my ($target,$token,$parstack,$parser,$safeeval)=@_; - $Apache::inputtags::part='0'; + &Apache::lonxml::debug("in end_part $target "); + pop @Apache::inputtags::status; + if ( $target eq 'meta' ) { return ''; } + if ( $target eq 'grade' ) { return &Apache::inputtags::grade; } + return &Apache::inputtags::gradestatus($Apache::inputtags::part); +} + +sub start_preduedate { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') { + &Apache::lonxml::get_all_text("/pre_duedate",$$parser[$#$parser]); + } + } + return ''; } +sub end_preduedate { + return ''; +} + +sub start_postanswerdate { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { + &Apache::lonxml::get_all_text("/post_answerdate",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_postanswerdate { + return ''; +} + +sub start_notsolved { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; + &Apache::lonxml::debug("not solved has :$gradestatus:"); + if ($gradestatus =~ /^correct/) { + &Apache::lonxml::debug("skipping"); + &Apache::lonxml::get_all_text("/not_solved",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_notsolved { + return ''; +} + +sub start_solved { + my ($target,$token,$parstack,$parser,$safeeval)=@_; + if ($target ne 'meta') { + my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; + if ($gradestatus !~ /^correct/) { + &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); + } + } + return ''; +} + +sub end_solved { + return ''; +} 1; __END__