loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.14 and 1.21

-version 1.14, 2000/11/28 19:15:48
+version 1.21, 2000/12/12 22:35:52
  Line 12  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 {
- Line 21  sub end_web {
+ Line 24  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 '';
  }
- Line 29  sub end_tex {
+ Line 35  sub end_tex {
  sub start_problem {
    my ($target,$token,$parstack,$parser,$safeeval)=@_;
-   my $args ='';
-   if ( $#$parstack > -1 ) {
+ #intialize globals
-     $args=$$parstack[$#$parstack];
-   }
-   my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
    $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,$safeeval);
-   &Apache::run::run($expression)
+   if ($target ne 'meta') {
-   return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
+     my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",'0');
+     if ( !$passed ) {
+       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";
+       }
+     }
+   }
+   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 "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
+   }
+   return '';
  }
  sub end_problem {
-   return "</form></body>\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 <part>s existed, so we need to the grading
+       &Apache::inputtags::grade;
+     } elsif ($Apache::inputtags::part eq '0') {
+       # if part is zero, no <part>s existed, so we need show the current
+       # grading status
+       $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
+     }
+     if ($target eq 'web') { $result.="</form></body>\n"; }
+   } else {
+     if ($Apache::inputtags::part eq '0') {
+       $result=&Apache::response::mandatory_part_meta;
+     }
+   }
+   return $result;
  }
  sub start_block {
- Line 154  sub start_part {
+ Line 192  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;
+   } else {
+     my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+     if ( !$passed ) {
+       my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
+       if ( $target eq "web" ) {
+ 	return "Part is not open to be viewed. It opens on $date";
+       }
+     }
+   }
+   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);
  }
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.14
changed lines
	Added in v.1.21