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

Diff for /loncom/homework/response.pm between versions 1.128 and 1.129

version 1.128, 2005/11/10 22:19:27 version 1.129, 2005/11/15 15:57:45
Line 32  use Apache::lonlocal; Line 32  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','algorithmicresponse'));      &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse'));
 }  }
   
 sub start_response {  sub start_response {
Line 362  sub end_dataresponse { Line 362  sub end_dataresponse {
     return $result;      return $result;
 }  }
   
 sub start_algorithmicresponse {  sub start_customresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     push(@Apache::lonxml::namespace,'algorithmicresponse');      push(@Apache::lonxml::namespace,'customresponse');
     my $result;      my $result;
     undef($Apache::response::algorithmic_answer);      undef($Apache::response::custom_answer);
     &Apache::lonxml::register('Apache::response',('answer'));      &Apache::lonxml::register('Apache::response',('answer'));
     if ($target eq 'web') {      if ($target eq 'web') {
   if (  &Apache::response::show_answer() ) {    if (  &Apache::response::show_answer() ) {
Line 391  sub start_algorithmicresponse { Line 391  sub start_algorithmicresponse {
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result .= &Apache::response::meta_package_write('algorithmicresponse');   $result .= &Apache::response::meta_package_write('customresponse');
     }      }
     return $result;      return $result;
 }  }
   
 sub end_algorithmicresponse {  sub end_customresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
Line 404  sub end_algorithmicresponse { Line 404  sub end_algorithmicresponse {
     if ( $target eq 'grade' && &Apache::response::submitted() ) {      if ( $target eq 'grade' && &Apache::response::submitted() ) {
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/ &&    if ( $response =~ /[^\s]/ && 
      $Apache::response::algorithmic_answer_type eq 'loncapa/perl') {       $Apache::response::custom_answer_type eq 'loncapa/perl') {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
Line 413  sub end_algorithmicresponse { Line 413  sub end_algorithmicresponse {
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
  $response;   $response;
     my $error;      my $error;
     ${$safeeval->varglob('LONCAPA::algorithmicresponse_submission')}=      ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
  $response;   $response;
           
     my $award = &Apache::run::run('{ my $submission=$LONCAPA::algorithmicresponse_submission;'.$Apache::response::algorithmic_answer.'}',$safeeval);      my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);
     if (!&Apache::inputtags::valid_award($award)) {      if (!&Apache::inputtags::valid_award($award)) {
  $error = $award;   $error = $award;
  $award = 'ERROR';   $award = 'ERROR';
Line 439  sub end_algorithmicresponse { Line 439  sub end_algorithmicresponse {
 sub start_answer {  sub start_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     $Apache::response::algorithmic_answer=      $Apache::response::custom_answer=
  &Apache::lonxml::get_all_text_unbalanced("/answer",$parser);   &Apache::lonxml::get_all_text_unbalanced("/answer",$parser);
     $Apache::response::algorithmic_answer_type=      $Apache::response::custom_answer_type=
  lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));   lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));
     $Apache::response::algorithmic_answer_type =~ s/\s+//g;      $Apache::response::custom_answer_type =~ s/\s+//g;
     if ($target eq "edit" ) {      if ($target eq "edit" ) {
  $result=&Apache::edit::tag_start($target,$token,'Answer algorithm');   $result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
  $result.=&Apache::edit::editfield($token->[1],   $result.=&Apache::edit::editfield($token->[1],
   $Apache::response::algorithmic_answer,    $Apache::response::custom_answer,
   '',80,4);    '',80,4);
     } elsif ( $target eq "modified" ) {      } elsif ( $target eq "modified" ) {
  $result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);   $result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
Removed from v.1.128  
changed lines
  Added in v.1.129

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