Return to caparesponse.pm CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

- <numericalresponse> now supports format="", can be array or scalar, if scalar and an array of answers, the single format is applied to all
- fixed breakage with displaying the answer if the string involves symbols

    1: # The LearningOnline Network with CAPA
    2: # caparesponse definition
    3: 
    4: package Apache::caparesponse;
    5: use strict;
    6: use capa;
    7: 
    8: sub BEGIN {
    9:   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));
   10: }
   11: 
   12: sub start_caparesponse {
   13:   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   14:   my $id = &Apache::response::start_response($parstack,$safeeval);
   15:   return '';
   16: }
   17: 
   18: sub end_caparesponse {
   19:   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   20:   my $result = '';
   21:   if ( $target eq 'grade' ) {
   22:     if ( defined $ENV{'form.submitted'}) {
   23:       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
   24:       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   25:       if ( $response =~ /[^\s]/) {
   26: 	my $id = $Apache::inputtags::response['-1'];
   27: 	my $previous= &Apache::response::check_for_previous($response,$id,$response);
   28: 	if ( $previous ) { 
   29: 	  $result = 'PREVIOUSLY_USED';
   30: 	} else {
   31: 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
   32: 	  &Apache::lonxml::debug("submitted a $response<br>\n");
   33: 	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
   34: 	  my $expression="&caparesponse_check('".$response."','".
   35: 	    $$parstack[$#$parstack].
   36: 	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
   37: 		';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
   38: 		  "');";
   39: 	  $result = &Apache::run::run($expression,$safeeval);
   40: 	  my ($ad) = split /:/ , $result;
   41: 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
   42: 	  &Apache::lonxml::debug("$expression");
   43: 	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
   44: 	}
   45:       }
   46:     }
   47:   } elsif ($target eq 'web') {
   48:     #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   49:   }
   50:   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
   51:   &Apache::response::end_response;
   52:   return '';
   53: }
   54: 
   55: sub start_numericalresponse {
   56:   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   57:   my $id = &Apache::response::start_response($parstack,$safeeval);
   58:   my $result;
   59:   if ($target eq 'edit') {
   60:     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
   61:     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
   62:     if ($token->[1] eq 'numericalresponse') {
   63:       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
   64:       $result.=&Apache::edit::text_arg('Format:','format',$token,4);
   65:     } else {
   66:       $result.=&Apache::edit::select_arg('Type:','type',
   67: 					 ['cs','ci','mc'],$token)
   68:     }
   69:     $result.='</td></tr><tr><td colspan="3">';
   70:   } elsif ($target eq 'modified') {
   71:     my $constructtag;
   72:     if ($token->[1] eq 'numericalresponse') {
   73:       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
   74: 						'answer','unit','format');
   75:     } else {
   76:       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
   77: 						'answer','type');
   78:     }
   79:     if ($constructtag) {
   80:       $result = &Apache::edit::rebuild_tag($token);
   81:       $result.=&Apache::edit::handle_insert();
   82:     }
   83:   }
   84:   return $result;
   85: }
   86: 
   87: sub end_numericalresponse {
   88:   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   89:   my $result = '';
   90:   if ( $target eq 'grade' ) {
   91:     if ( defined $ENV{'form.submitted'}) {
   92:       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
   93:       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   94:       if ( $response =~ /[^\s]/) {
   95: 	my $id = $Apache::inputtags::response['-1'];
   96: 	my $previous= &Apache::response::check_for_previous($response,$id,$response);
   97: 	if ( $previous ) { 
   98: 	  $result = 'PREVIOUSLY_USED';
   99: 	} else {
  100: 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
  101: 	  &Apache::lonxml::debug("submitted a $response<br>\n");
  102: 	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
  103: 	  $response =~ s/\\/\\\\/g;
  104: 	  $response =~ s/\'/\\\'/g;
  105: 	  &Apache::lonxml::debug("current $response");
  106: 	  my $expression="&caparesponse_check_list('".$response."','".
  107: 	    $$parstack[$#$parstack].
  108: 	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
  109: 	      ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
  110: 		"');";
  111: 	  $result = &Apache::run::run($expression,$safeeval);
  112: 	  my ($awards) = split /:/ , $result;
  113: 	  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
  114: 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
  115: 	  &Apache::lonxml::debug("$expression");
  116: 	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  117: 	  $result='';
  118: 	}
  119:       }
  120:     }
  121:   } elsif ($target eq 'web') {
  122:     my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  123:     my $status = $Apache::inputtags::status['-1'];
  124:     if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
  125:       my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
  126:       my (@answers)=&Apache::run::run("return $answervar",$safeeval,1);
  127:       if (!defined($answers[0])) { $answers[0]=$answervar; } else {
  128: 	&Apache::lonxml::debug("answers is $#answers :$answers[0]:");
  129:       }
  130:       my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval);
  131:       my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1);
  132:       if (!defined($formats[0])) { $formats[0]=$formatvar; }
  133: 
  134:       my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);
  135: 
  136:       $result="<br></br>The computer got ";
  137: 
  138:       for (my $i=0; $i <= $#answers; $i++) {
  139: 	my $answer=$answers[$i];
  140: 	my $format;
  141: 	if ($#formats > 0) {
  142: 	  $format=$formats[$i];
  143: 	} else {
  144: 	  $format=$formats[0];
  145: 	}
  146: 	if (defined($format)) {
  147: 	  &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
  148: 	  $result.=sprintf('%.'.$format,$answer).',';
  149: 	} else {
  150: 	  &Apache::lonxml::debug("no format answer :$answer:");
  151: 	  $result.="$answer,";
  152: 	}
  153:       }
  154:       chop $result;
  155:       $result.=" $unit.<br></br>";
  156:     }
  157:   } elsif ($target eq 'edit') {
  158:     $result.='</td></tr>'.&Apache::edit::end_table;
  159:   }
  160:   &Apache::response::end_response;
  161:   return $result;
  162: }
  163: 
  164: sub start_stringresponse {
  165:   return start_numericalresponse(@_);
  166: }
  167: 
  168: sub end_stringresponse {
  169:   return end_numericalresponse(@_);
  170: }
  171: 
  172: 1;
  173: __END__
  174: