--- loncom/homework/structuretags.pm 2000/11/28 20:11:25 1.15 +++ loncom/homework/structuretags.pm 2000/12/05 22:07:26 1.20 @@ -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,24 +35,44 @@ 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); + + 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"; + } + return ''; } sub end_problem { - return "
\n"; + my ($target,$token,$parstack,$parser,$safeeval)=@_; + my $result=''; + 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') { $result.="\n"; } + } else { + if ($Apache::inputtags::part eq '0') { + $result=&Apache::response::mandatory_part_meta; + } + } + return $result; } sub start_block { @@ -158,14 +184,19 @@ 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; } + return ''; } sub end_part { my ($target,$token,$parstack,$parser,$safeeval)=@_; - $Apache::inputtags::part='0'; + &Apache::lonxml::debug("in end_part $target "); + if ( $target eq 'meta' ) { return ''; } + if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; } + return &Apache::inputtags::gradestatus($Apache::inputtags::part); } 1;