Diff for /loncom/homework/structuretags.pm between versions 1.240 and 1.241

version 1.240, 2004/02/16 20:01:26 version 1.241, 2004/02/16 20:20:01
Line 336  sub init_problem_globals { Line 336  sub init_problem_globals {
     if ($type eq 'problem') {      if ($type eq 'problem') {
  $Apache::inputtags::part='0';   $Apache::inputtags::part='0';
  @Apache::inputtags::partlist=('0');   @Apache::inputtags::partlist=('0');
  $Apache::lonhomework::problemstatus=  
     &Apache::lonnet::EXT('resource.0.problemstatus');   $Apache::lonhomework::problemstatus=&get_problem_status('0')
  &Apache::lonxml::debug("problem status is  $Apache::lonhomework::problemstatus");  
  &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});  
  if ($ENV{'request.state'} eq 'construct' &&  
     defined($ENV{'form.problemstatus'})) {  
     $Apache::lonhomework::problemstatus=$ENV{'form.problemstatus'};  
  }  
     } else {      } else {
  $Apache::inputtags::part='';   $Apache::inputtags::part='';
  @Apache::inputtags::partlist=();   @Apache::inputtags::partlist=();
Line 373  sub reset_problem_globals { Line 367  sub reset_problem_globals {
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
 }  }
   
 sub set_problem_status {  sub set_problem_state {
     my ($part)=@_;      my ($part)=@_;
     if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {      if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
  $Apache::lonhomework::history{"resource.$part.solved"}=   $Apache::lonhomework::history{"resource.$part.solved"}=
Line 381  sub set_problem_status { Line 375  sub set_problem_status {
     }      }
 }  }
   
   sub get_problem_status {
       my ($part)=@_;
       my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
       &Apache::lonxml::debug("problem status for $part is $problem_status");
       &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
       if ($ENV{'request.state'} eq 'construct' &&
    defined($ENV{'form.problemstatus'})) {
    $problem_status=$ENV{'form.problemstatus'};
       }
       return $problem_status;
   }
   
 sub start_problem {  sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 403  sub start_problem { Line 409  sub start_problem {
  if ($target eq 'web') {   if ($target eq 'web') {
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
  }   }
         if ($ENV{'request.state'} eq 'construct') { &set_problem_status('0'); }          if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
  if (($ENV{'request.state'} eq 'construct') &&   if (($ENV{'request.state'} eq 'construct') &&
     defined($ENV{'form.problemtype'})) {      defined($ENV{'form.problemtype'})) {
Line 994  sub start_part { Line 1000  sub start_part {
     @Apache::inputtags::response=();      @Apache::inputtags::response=();
     @Apache::inputtags::previous=();      @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();      @Apache::inputtags::previous_version=();
     $Apache::lonhomework::problemstatus=      $Apache::lonhomework::problemstatus=&get_problem_status($id);
  &Apache::lonnet::EXT("resource.$id.problemstatus");  
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
Line 1015  sub start_part { Line 1020  sub start_part {
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
     if ($ENV{'request.state'} eq 'construct') {      if ($ENV{'request.state'} eq 'construct') {
  &set_problem_status($Apache::inputtags::part);    &set_problem_state($Apache::inputtags::part); 
     }      }
     if (( $status eq 'CLOSED' ) ||      if (( $status eq 'CLOSED' ) ||
  ( $status eq 'UNCHECKEDOUT') ||   ( $status eq 'UNCHECKEDOUT') ||

Removed from v.1.240  
changed lines
  Added in v.1.241


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