[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.37 and 1.42

version 1.37, 2001/07/23 22:40:59 version 1.42, 2001/08/13 21:44:24
Line 80  sub start_numericalresponse { Line 80  sub start_numericalresponse {
       $result = &Apache::edit::rebuild_tag($token);        $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();        $result.=&Apache::edit::handle_insert();
     }      }
     } elsif ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('numericalresponse');
   }    }
   return $result;    return $result;
 }  }
Line 89  sub end_numericalresponse { Line 91  sub end_numericalresponse {
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
         &Apache::response::setup_params('numericalresponse');
       $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;   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[$#$parstack].   }
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.   $expression.="');";
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.   $result = &Apache::run::run($expression,$safeeval);
  "');";   my ($awards) = split /:/ , $result;
   $result = &Apache::run::run($expression,$safeeval);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
   my ($awards) = split /:/ , $result;   if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);    if ($previous{'last'}) {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;      push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
   &Apache::lonxml::debug("$expression");    } else {
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
   $result='';    }
  }   }
    $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 162  sub end_numericalresponse { Line 171  sub end_numericalresponse {
 }  }
   
 sub start_stringresponse {  sub start_stringresponse {
   return start_numericalresponse(@_);    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('stringresponse');
     } else {
       $result.=&start_numericalresponse(@_);
     }
     return $result;
 }  }
   
 sub end_stringresponse {  sub end_stringresponse {
Removed from v.1.37  
changed lines
  Added in v.1.42

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