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

Diff for /loncom/homework/response.pm between versions 1.154 and 1.158

version 1.154, 2006/12/11 22:02:13 version 1.158, 2006/12/18 21:37:47
Line 368  sub start_customresponse { Line 368  sub start_customresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     push(@Apache::lonxml::namespace,'customresponse');      push(@Apache::lonxml::namespace,'customresponse');
     my $result;      my $result;
     undef($Apache::response::custom_answer);      @Apache::response::custom_answer=();
       @Apache::response::custom_answer_type=();
     &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 408  sub end_customresponse { Line 409  sub end_customresponse {
     &Apache::response::submitted('scantron')) {      &Apache::response::submitted('scantron')) {
     &Apache::response::scored_response($part,$id);      &Apache::response::scored_response($part,$id);
  } elsif ( $response =~ /[^\s]/ &&    } elsif ( $response =~ /[^\s]/ && 
   $Apache::response::custom_answer_type eq 'loncapa/perl') {    $Apache::response::custom_answer_type[-1] 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 420  sub end_customresponse { Line 421  sub end_customresponse {
     ${$safeeval->varglob('LONCAPA::customresponse_submission')}=      ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
  $response;   $response;
           
     my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval);      my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
     if (!&Apache::inputtags::valid_award($award)) {      if (!&Apache::inputtags::valid_award($award)) {
  $error = $award;   $error = $award;
  $award = 'ERROR';   $award = 'ERROR';
Line 448  sub end_customresponse { Line 449  sub end_customresponse {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition());
     }      }
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
       pop(@Apache::response::custom_answer);
       pop(@Apache::response::custom_answer_type);
     &Apache::lonxml::deregister('Apache::response',('answer'));      &Apache::lonxml::deregister('Apache::response',('answer'));
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
Line 459  sub start_mathresponse { Line 462  sub start_mathresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     push(@Apache::lonxml::namespace,'mathresponse');      push(@Apache::lonxml::namespace,'mathresponse');
     my $result;      my $result;
     undef($Apache::response::custom_answer);      @Apache::response::custom_answer=();
       @Apache::response::custom_answer_type=();
     &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 488  sub start_mathresponse { Line 492  sub start_mathresponse {
  }   }
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
  my $args_ref= \%{$safeeval->varglob('LONCAPA::mathresponse_args')};  
  undef(%{ $args_ref });  
  $$args_ref{'cas'}=$token->[2]{'cas'};  
         if ($token->[2]{'args'}=~/\$/) {  
     $$args_ref{'args'}=&Apache::run::run($token->[2]{'args'},$safeeval);  
  } elsif ($token->[2]{'args'}=~/\@/) {  
     $$args_ref{'args'}=&Apache::run::run('join(",",'.$token->[2]{'args'}.')',$safeeval);  
  } else {  
     $$args_ref{'args'}=$token->[2]{'args'};  
  }  
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result .= &Apache::response::meta_package_write('mathresponse');   $result .= &Apache::response::meta_package_write('mathresponse');
     }      }
Line 520  sub end_mathresponse { Line 514  sub end_mathresponse {
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
  $response;   $response;
     my $error;      my $error;
     my $args_ref= \%{$safeeval->varglob('LONCAPA::mathresponse_args')};      my $award;
             my $award;      my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
             if ($$args_ref{'cas'} eq 'maxima') {              if ($cas eq 'maxima') {
  $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$$args_ref{'args'});                  my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
     }                  $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
               }
     if (!&Apache::inputtags::valid_award($award)) {      if (!&Apache::inputtags::valid_award($award)) {
  $error = $award;   $error = $award;
  $award = 'ERROR';   $award = 'ERROR';
Line 539  sub end_mathresponse { Line 534  sub end_mathresponse {
  }   }
     }      }
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
       pop(@Apache::response::custom_answer);
       pop(@Apache::response::custom_answer_type);
     &Apache::lonxml::deregister('Apache::response',('answer'));      &Apache::lonxml::deregister('Apache::response',('answer'));
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
   sub implicit_multiplication {
       my ($expression)=@_;
   # Escape scientific notation, so 3e8 does not become 3*e*8
   # 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8
       $expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi;
   # 3x10^8 -> 3&8; 3*10^-8 -> 3&-8
       $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
   # Fill in multiplication signs
   # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
       $expression=~s/(\w)\s+(\w)/$1\*$2/gs;
   # )( -> )*(; ) ( -> )*(
       $expression=~s/\)\s*\(/\)\*\(/gs;
   # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
       $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
   # a ( -> a*(
       $expression=~s/(\w)\s+\(/$1\*\(/gs;
   # )a -> )*a; )3 -> )*3; ) 3 -> )*3
       $expression=~s/\)\s*(\w)/\)\*$1/gs;
   # 3&8 -> 3e8; 3&-4 -> 3e-4
       $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
       return $expression;
   }
   
 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::custom_answer=      push(@Apache::response::custom_answer,
  &Apache::lonxml::get_all_text_unbalanced("/answer",$parser);   &Apache::lonxml::get_all_text_unbalanced("/answer",$parser));
     $Apache::response::custom_answer_type=      push(@Apache::response::custom_answer_type,
  lc(&Apache::lonxml::get_param('type',$parstack,$safeeval));   lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)));
     $Apache::response::custom_answer_type =~ s/\s+//g;      $Apache::response::custom_answer_type[-1] =~ 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::custom_answer,    $Apache::response::custom_answer[-1],
   '',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.154  
changed lines
  Added in v.1.158

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