--- loncom/homework/structuretags.pm 2000/12/01 00:44:48 1.18
+++ loncom/homework/structuretags.pm 2000/12/04 21:51:30 1.19
@@ -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,29 +35,38 @@ sub end_tex {
sub start_problem {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- unless ($target eq 'meta') {
+
+#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 eq 'web') {
+ # create a page header and exit
my $args ='';
- if ( $#$parstack > -1 ) {
- $args=$$parstack[$#$parstack];
- }
+ if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
- $Apache::inputtags::part='0';
- @Apache::inputtags::responselist = ();
- my $expression='$external::part='.$Apache::inputtags::part.';';
- $safeeval->share_from('Apache::inputtags',['@part']);
- &Apache::run::run($expression,$safeeval);
return "$name\n\n\n";
+ 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;
+ }
+ if ($target eq 'web') { $result.=" \n"; }
} else {
if ($Apache::inputtags::part eq '0') {
$result=&Apache::response::mandatory_part_meta;
@@ -173,16 +188,15 @@ sub start_part {
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
}
+ return '';
}
sub end_part {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
- if ( $target eq 'meta' ) {
- return '';
- }
- my $result=&Apaceh::inputtags::grade;
- return $result;
+ if ( $target eq 'meta' ) { return ''; }
+ if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }
+ return &Apache::inputtags::gradestatus;
}
1;