--- loncom/homework/structuretags.pm 2000/11/22 00:03:37 1.12
+++ loncom/homework/structuretags.pm 2000/12/01 00:44:48 1.18
@@ -29,19 +29,35 @@ sub end_tex {
sub start_problem {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $args ='';
- if ( $#$parstack > -1 ) {
- $args=$$parstack[$#$parstack];
- }
- my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
- push (@Apache::inputtags::part,'0');
- $safeeval->share_from('Apache::lonnet',['&EXT']);
- $safeeval->share_from('Apache::inputtags',['@part']);
- return "
$name\n\n\n";
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my $result='';
+ unless ($target eq 'meta') {
+ if ( $target eq 'web' && $Apache::inputtags::part eq '0') {
+ $result.=&Apache::inputtags::grade;
+ }
+ $result.="\n";
+ } else {
+ if ($Apache::inputtags::part eq '0') {
+ $result=&Apache::response::mandatory_part_meta;
+ }
+ }
+ return $result;
}
sub start_block {
@@ -152,12 +168,21 @@ sub start_part {
my $args ='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
- push (@Apache::inputtags::part,$id);
+ $Apache::inputtags::part=$id;
+ @Apache::inputtags::responselist = ();
+ if ($target eq 'meta') {
+ return &Apache::response::mandatory_part_meta;
+ }
}
sub end_part {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- pop @Apache::inputtags::part;
+ &Apache::lonxml::debug("in end_part $target ");
+ if ( $target eq 'meta' ) {
+ return '';
+ }
+ my $result=&Apaceh::inputtags::grade;
+ return $result;
}
1;