[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.86 and 1.87

version 1.86, 2003/03/26 18:44:13 version 1.87, 2003/04/07 22:44:32
Line 46  sub end_caparesponse { Line 46  sub end_caparesponse {
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};        my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $previous= &Apache::response::check_for_previous($response,$id,$response);   my $previous= &Apache::response::check_for_previous($response,$id,$response);
Line 133  sub end_numericalresponse { Line 133  sub end_numericalresponse {
       &Apache::response::setup_params($$tagstack[-1]);        &Apache::response::setup_params($$tagstack[-1]);
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $partid = $Apache::inputtags::part;        my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];        my $response = &Apache::response::getresponse();
       my $response = $ENV{'form.HWVAL'.$id};  
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  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::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[$#$parstack] . "\n<br>");   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
  $response =~ s/\\/\\\\/g;   if ($Apache::lonhomework::type eq 'exam') {
  $response =~ s/\'/\\\'/g;      
  &Apache::lonxml::debug("current $response");   } else {
  my $expression="&caparesponse_check_list('".$response."','".      $response =~ s/\\/\\\\/g;
     $$parstack[-1];      $response =~ s/\'/\\\'/g;
  foreach my $key (keys(%Apache::inputtags::params)) {      &Apache::lonxml::debug("current $response");
   $expression.= ';my $'. #'      my $expression="&caparesponse_check_list('".$response."','".
     $key.'="'.$Apache::inputtags::params{$key}.'"';   $$parstack[-1];
  }      foreach my $key (keys(%Apache::inputtags::params)) {
  if ($$tagstack[-1] eq 'formularesponse') {   $expression.= ';my $'. #'
   $expression.=';my $type="fml";';      $key.'="'.$Apache::inputtags::params{$key}.'"';
  } elsif ($$tagstack[-1] eq 'numericalresponse') {      }
   $expression.=';my $type="float";';      if ($$tagstack[-1] eq 'formularesponse') {
    $expression.=';my $type="fml";';
       } elsif ($$tagstack[-1] eq 'numericalresponse') {
    $expression.=';my $type="float";';
       }
       $expression.="');";
       $result = &Apache::run::run($expression,$safeeval);
       my ($awards) = split /:/ , $result;
       my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
  }   }
  $expression.="');";  
  $result = &Apache::run::run($expression,$safeeval);  
  my ($awards) = split /:/ , $result;  
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);  
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  &Apache::lonxml::debug("$expression");   &Apache::lonxml::debug("$expression");
Line 221  sub end_numericalresponse { Line 224  sub end_numericalresponse {
  my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers   my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
  my $factors_number = 5; #default values for number of factors   my $factors_number = 5; #default values for number of factors
  my $powers_number = 8; #default values for number of powers   my $powers_number = 8; #default values for number of powers
  my $symb;  
  if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}  
   
  &Apache::response::setrandomnumber();   &Apache::response::setrandomnumber();
  my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);   my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
Line 255  sub end_numericalresponse { Line 256  sub end_numericalresponse {
     }      }
     $ans = sprintf('%.'.$format,$bubbles_values[$ind]);      $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
  }   }
     $result.='<td><input type="radio" name="HWVAL'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';      $result.='<td><input type="radio" name="HWVAL_'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
   } elsif ($$tagstack[-1] eq 'formularesponse') {    } elsif ($$tagstack[-1] eq 'formularesponse') {
Removed from v.1.86  
changed lines
  Added in v.1.87

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