[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.36 and 1.38

version 1.36, 2001/07/20 21:19:03 version 1.38, 2001/08/03 22:12:07
Line 90  sub end_numericalresponse { Line 90  sub end_numericalresponse {
   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 $partid = $Apache::inputtags::part;
         my $id = $Apache::inputtags::response['-1'];
         my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  my $id = $Apache::inputtags::response['-1'];   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  my $previous= &Apache::response::check_for_previous($response,$id,$response);   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  if ( $previous ) {    &Apache::lonxml::debug("submitted a $response<br>\n");
   $result = 'PREVIOUSLY_USED';   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
  } else {   $response =~ s/\\/\\\\/g;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;   $response =~ s/\'/\\\'/g;
   &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("current $response");
   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");   my $expression="&caparesponse_check_list('".$response."','".
   $response =~ s/\\/\\\\/g;    $$parstack[$#$parstack].
   $response =~ s/\'/\\\'/g;      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
   &Apache::lonxml::debug("current $response");  
   my $expression="&caparesponse_check_list('".$response."','".  
     $$parstack[$#$parstack].  
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.  
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.        ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
  "');";   "');";
   $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
   my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;   if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
   &Apache::lonxml::debug("$expression");    if ($previous{'last'}) {
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
   $result='';    } else {
       push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
     }
  }   }
    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
    &Apache::lonxml::debug("$expression");
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    $result='';
       }        }
     }      }
   } elsif ($target eq 'web') {    } elsif ($target eq 'web') {
Line 143  sub end_numericalresponse { Line 147  sub end_numericalresponse {
  } else {   } else {
   $format=$formats[0];    $format=$formats[0];
  }   }
  if (defined($format)) {   if ((defined($format)) && ($format ne '')) {
   &Apache::lonxml::debug("formatting with :$format: answer :$answer:");    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
   $result.=sprintf('%.'.$format,$answer).',';    $result.=sprintf('%.'.$format,$answer).',';
  } else {   } else {
Removed from v.1.36  
changed lines
  Added in v.1.38

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