[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.23 and 1.24

version 1.23, 2000/12/19 23:22:22 version 1.24, 2000/12/21 18:13:33
Line 6  use strict; Line 6  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
 sub BEGIN {  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','pre_duedate','post_answerdate','solved','not_solved'));
 }  }
   
 sub start_web {  sub start_web {
Line 48  sub start_problem { Line 48  sub start_problem {
   if ($target ne 'meta') {    if ($target ne 'meta') {
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');      ($status,$datemsg) = &Apache::lonhomework::check_date('0');
     push (@Apache::inputtags::status,$status);      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' ) {      if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);        my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {        if ( $target eq "web" ) {
Line 72  sub start_problem { Line 75  sub start_problem {
 sub end_problem {  sub end_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
   my $status=@Apache::inputtags::status['-1'];    my $status=$Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {    unless ($target eq 'meta') {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {      if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need to the grading        # if part is zero, no <part>s existed, so we need to the grading
Line 105  sub start_block { Line 108  sub start_block {
   $code .=';return $condition;';    $code .=';return $condition;';
 #  print "<br>$code<br>";  #  print "<br>$code<br>";
   my $result = &Apache::run::run($code,$safeeval);    my $result = &Apache::run::run($code,$safeeval);
     &Apache::lonxml::debug("block :$code: returned :$result:");
   if ( ! $result ) {     if ( ! $result ) { 
 #    my $skip=$$parser[$#$parser]->get_text("/block");  
     my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);      my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
 #    print "skipped $skip";      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
   }    }
   return "";    return "";
 }  }
Line 230  sub end_part { Line 233  sub end_part {
   &Apache::lonxml::debug("in end_part $target ");    &Apache::lonxml::debug("in end_part $target ");
   pop @Apache::inputtags::status;    pop @Apache::inputtags::status;
   if ( $target eq 'meta' ) { return ''; }    if ( $target eq 'meta' ) { return ''; }
   if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }    if ( $target eq 'grade' ) { return &Apache::inputtags::grade; }
   return &Apache::inputtags::gradestatus($Apache::inputtags::part);    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
 }  }
   
   sub start_pre_duedate {
     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_pre_duedate {
     return '';
   }
   
   sub start_post_answerdate {
     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_post_answerdate {
     return '';
   }
   
   sub start_not_solved {
     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_not_solved {
     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;  1;
 __END__  __END__
Removed from v.1.23  
changed lines
  Added in v.1.24

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