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

Diff for /loncom/homework/structuretags.pm between versions 1.179 and 1.185

version 1.179, 2003/06/04 14:49:20 version 1.185, 2003/06/17 15:36:11
Line 43  BEGIN { Line 43  BEGIN {
   
 sub start_web {  sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);      if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
     if ($target eq 'web') {    $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
  return $bodytext;   my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
     }      }
     return '';      return '';
 }  }
Line 56  sub end_web { Line 56  sub end_web {
   
 sub start_tex {  sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);      if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
     if ($target eq 'tex') {    $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
  return $bodytext.' ';   &Apache::lonxml::debug("tex 1");
    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
     }      }
     return '';      return '';
 }  }
Line 154  sub setup_rndseed { Line 155  sub setup_rndseed {
  $rndseed=int(rand(1000000000));   $rndseed=int(rand(1000000000));
     }      }
     $ENV{'form.rndseed'}=$rndseed;      $ENV{'form.rndseed'}=$rndseed;
       delete($ENV{'form.resetdata'});
       delete($ENV{'form.newrandomization'});
  }   }
  &Apache::lonxml::debug("Setting rndseed to $rndseed");   &Apache::lonxml::debug("Setting rndseed to $rndseed");
  &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);   &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
Line 263  ENDCHECKOUT Line 266  ENDCHECKOUT
 sub start_problem {  sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     $Apache::lonhomework::parsing_a_problem=1;      if ( $Apache::inputtags::part ne '' ||
     # meta is called from lonpublisher, which doesn't uses the normal   $Apache::lonhomework::parsing_a_problem) {
     # lonhomework method of parsing the file which means that inputtags    &Apache::lonxml::error('Only one <problem> allowed in a .problem file');
     # won't get reset   #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
     if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {  
  &Apache::lonxml::error('Only one problem allowed in a .problem file');  
  my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);  
  return '';   return '';
     }      }
   
       $Apache::lonhomework::parsing_a_problem=1;
 #initialize globals  #initialize globals
     $Apache::inputtags::part='0';      $Apache::inputtags::part='0';
     @Apache::inputtags::partlist=('0');      @Apache::inputtags::partlist=('0');
Line 345  sub start_problem { Line 347  sub start_problem {
     '<input type="submit" name="resetdata"      '<input type="submit" name="resetdata"
                              value="New Problem Variation" />'.                               value="New Problem Variation" />'.
     '<input type="hidden" name="username"      '<input type="hidden" name="username"
                              value="'.$ENV{'form.username'}.'" />';                               value="'.$ENV{'form.username'}.'" /> <br />';
  }   }
  ($status,$accessmsg) = &Apache::lonhomework::check_access('0');   ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
  push (@Apache::inputtags::status,$status);   push (@Apache::inputtags::status,$status);
Line 934  sub end_part { Line 936  sub end_part {
  $target);   $target);
  if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}   if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
  $result=$gradestatus;   $result=$gradestatus;
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
     }      }
     pop @Apache::inputtags::status;      pop @Apache::inputtags::status;
     $Apache::inputtags::part='';      $Apache::inputtags::part='';
Removed from v.1.179  
changed lines
  Added in v.1.185

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