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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.98 and 1.115

version 1.98, 2003/05/13 15:27:45 version 1.115, 2003/10/14 22:53:22
Line 114  sub end_numericalresponse { Line 114  sub end_numericalresponse {
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
  my $ad;   my $ad;
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;  
  &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("submitted a $response<br>\n");
  &Apache::lonxml::debug($$parstack[-1] . "\n<br>");   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
   
Line 131  sub end_numericalresponse { Line 130  sub end_numericalresponse {
     $response =~ s/\\/\\\\/g;      $response =~ s/\\/\\\\/g;
     $response =~ s/\'/\\\'/g;      $response =~ s/\'/\\\'/g;
  }   }
    $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("current $response");   &Apache::lonxml::debug("current $response");
  my $expression="&caparesponse_check_list('".$response."','".   my $expression="&caparesponse_check_list('".$response."','".
     $$parstack[-1];      $$parstack[-1];
Line 150  sub end_numericalresponse { Line 150  sub end_numericalresponse {
     $expression.=';my $type="float";';      $expression.=';my $type="float";';
  }   }
  $expression.="');";   $expression.="');";
    my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
    &Apache::lonxml::debug('answer is'.join(':',@answer));
    @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
   
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
  ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
Line 165  sub end_numericalresponse { Line 169  sub end_numericalresponse {
      $safeeval);       $safeeval);
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  my $status = $Apache::inputtags::status['-1'];   my $status = $Apache::inputtags::status['-1'];
  if (   ($award =~ /^correct/   if (  &Apache::response::show_answer() ) {
                 && lc($Apache::lonhomework::problemstatus) ne 'no')  
              || $status eq "SHOW_ANSWER"  
              || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {  
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<br />The correct answer is ";   $result="<br />The correct answer is ";
     } elsif ($target eq 'tex') {  
  if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {  
     $result='\vskip 0 mm The correct answer is \\texttt{ ';  
  }  
     }      }
     for (my $i=0; $i <= $#answers; $i++) {      for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
Line 190  sub end_numericalresponse { Line 187  sub end_numericalresponse {
  }   }
  my $formatted;   my $formatted;
  if ((defined($format)) && ($format ne '')) {   if ((defined($format)) && ($format ne '')) {
       $format=~s/e/E/g;
     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");      &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
     $formatted=sprintf('%.'.$format,$answer).',';      $formatted=sprintf('%.'.$format,$answer).',';
  } else {   } else {
     &Apache::lonxml::debug("no format answer :$answer:");      &Apache::lonxml::debug("no format answer :$answer:");
     $formatted="$answer,";      $formatted="$answer,";
  }   }
  if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {  
     $result.=$formatted;  
  }  
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $formatted='';      $formatted='';
     #$formatted=&Apache::lonxml::latex_special_symbols($formatted);      #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
Line 208  sub end_numericalresponse { Line 203  sub end_numericalresponse {
     chop $result;      chop $result;
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=" $unit.<br />";   $result.=" $unit.<br />";
     } elsif ($target eq 'tex') {  
  if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {  
     $result.=&Apache::lonxml::latex_special_symbols($unit);  
     $result.="}. \\vskip 0 mm ";  
  }  
     }      }
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
Line 243  sub end_numericalresponse { Line 233  sub end_numericalresponse {
                            </textarea></font> <br /><br />';                             </textarea></font> <br /><br />';
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if (defined $unit and $Apache::lonhomework::type eq 'exam') {   if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
     $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';      $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
  }   }
  if ($$tagstack[-1] eq 'numericalresponse') {   if ($$tagstack[-1] eq 'numericalresponse') {
Line 309  sub end_numericalresponse { Line 299  sub end_numericalresponse {
     if ($Apache::inputtags::params{'sig'}) {      if ($Apache::inputtags::params{'sig'}) {
  ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});   ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
     }      }
     if ($fmt) {      if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
    $fmt=~s/e/E/g;
  $ans = sprintf('%.'.$fmt,$ans);   $ans = sprintf('%.'.$fmt,$ans);
  if ($high) {   if ($high) {
     $high=sprintf('%.'.$fmt,$high);      $high=sprintf('%.'.$fmt,$high);
Line 317  sub end_numericalresponse { Line 308  sub end_numericalresponse {
  }   }
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high) { $ans.=' ['.$low.','.$high.']'; }   if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
  if ($sighigh) {    if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
     if ($ENV{'form.print_answer'} eq 'yes') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig \\textit{$siglow - $sighigh}";    $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
  $ans.= " Sig <i>$siglow - $sighigh</i>";    $ans.= " Sig <i>$siglow - $sighigh</i>";
     }      }
  }   }
  $result.=&Apache::response::answer_part($$tagstack[-1],$ans);   $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
Line 334  sub end_numericalresponse { Line 325  sub end_numericalresponse {
  }   }
     }      }
  }   }
  if ($unit) {   if (defined($unit) and ($unit ne '') and
       $$tagstack[-1] eq 'numericalresponse') {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($ENV{'form.print_answer'} eq 'yes') {   if ($ENV{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
     "Unit: \\verb|$unit|");      " Unit: $unit ");
  } else {   } else {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
     "Unit: <b>$unit</b>");      "Unit: <b>$unit</b>");
  }   }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
       $unit);  
     }      }
  }   }
  if ($type || $token->[1] eq 'stringresponse') {   if ($type || $$tagstack[-1] eq 'stringresponse') {
     my $string='Case Insensitive';      my $string='Case Insensitive';
     if ($type eq 'mc') {      if ($type eq 'mc') {
  $string='Multiple Choice';   $string='Multiple Choice';
Line 360  sub end_numericalresponse { Line 351  sub end_numericalresponse {
  $string='Formula';   $string='Formula';
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  $result.=&Apache::response::answer_part($$tagstack[-1],   if ($ENV{'form.answer_output_mode'} eq 'tex') {
  '<b>'.$string.'</b>');      $result.=&Apache::response::answer_part($$tagstack[-1],
     "$string");
    } else {
       $result.=&Apache::response::answer_part($$tagstack[-1],
       "<b>$string</b>");
    }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
       $type);        $type);
     }      }
  }   }
Line 407  sub format_number { Line 403  sub format_number {
     my ($number,$format,$target)=@_;      my ($number,$format,$target)=@_;
     my $ans;      my $ans;
     if ($format ne '') {      if ($format ne '') {
    $format=~s/e/E/g;
  $ans = sprintf('%.'.$format,$number);   $ans = sprintf('%.'.$format,$number);
     } else {      } else {
  my $format = '';   my $format = '';
  #What is the number? (integer,decimal,floating point)   #What is the number? (integer,decimal,floating point)
  if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {   if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
     $format = 'e'.$2;      $format = '3e';
  } elsif ($number=~/^(\d*)\.(\d*)$/) {   } elsif ($number=~/^(\d*)\.(\d*)$/) {
     $format = '4f';      $format = '4f';
  } elsif ($number=~/^(\d*)$/) {   } elsif ($number=~/^(\d*)$/) {
Line 489  sub start_stringresponse { Line 486  sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'meta') {      if ($target eq 'meta') {
    &Apache::response::start_response($parstack,$safeeval);
  $result=&Apache::response::meta_package_write('stringresponse');   $result=&Apache::response::meta_package_write('stringresponse');
    &Apache::response::end_response();
     } else {      } else {
  $result.=&start_numericalresponse(@_);   $result.=&start_numericalresponse(@_);
     }      }
Line 504  sub start_formularesponse { Line 503  sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'meta') {      if ($target eq 'meta') {
    &Apache::response::start_response($parstack,$safeeval);
  $result=&Apache::response::meta_package_write('formularesponse');   $result=&Apache::response::meta_package_write('formularesponse');
    &Apache::response::end_response();
     } else {      } else {
  $result.=&start_numericalresponse(@_);   $result.=&start_numericalresponse(@_);
     }      }
Removed from v.1.98  
changed lines
  Added in v.1.115

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