[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.139 and 1.145

version 1.139, 2004/03/12 16:55:35 version 1.145, 2004/06/02 21:23:21
Line 39  sub start_numericalresponse { Line 39  sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;      my $result;
       undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Answer:','answer',$token);   $result.=&Apache::edit::text_arg('Answer:','answer',$token);
Line 99  sub end_numericalresponse { Line 100  sub end_numericalresponse {
     my $tag;      my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }      if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {      if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
  &Apache::response::setup_params($tag);   &Apache::response::setup_params($tag,$safeeval);
  $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 $id = $Apache::inputtags::response['-1'];
Line 122  sub end_numericalresponse { Line 123  sub end_numericalresponse {
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);      my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
     $response=$values[$response];      $response=$values[$response];
  } else {  
     $response =~ s/\\/\\\\/g;  
     $response =~ s/\'/\\\'/g;  
  }   }
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("current $response");   my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
  my $expression="&caparesponse_check_list('".$response."','".   $$args_ref{'response'}=$response;
     $$parstack[-1];  
  my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');   my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
   
    foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
    'samples') {
       $$args_ref{$arg}=
    &Apache::lonxml::get_param($arg,$parstack,$safeeval);
    }
  foreach my $key (keys(%Apache::inputtags::params)) {   foreach my $key (keys(%Apache::inputtags::params)) {
     $expression.= ';my $__LC__'. #'      $$args_ref{$key}=$Apache::inputtags::params{$key};
  $key.'="'.$Apache::inputtags::params{$key}.'"';  
  }   }
   
  #no way to enter units, with radio buttons   #no way to enter units, with radio buttons
  if ($Apache::lonhomework::type eq 'exam' ||   if ($Apache::lonhomework::type eq 'exam' ||
     lc($hideunit) eq "yes") {      lc($hideunit) eq "yes") {
     $expression.=';my $__LC__unit=undef;';      delete($$args_ref{'unit'});
  }   }
  #sig fig don't make much sense either   #sig fig don't make much sense either
  if (($Apache::lonhomework::type eq 'exam' ||   if (($Apache::lonhomework::type eq 'exam' ||
      $ENV{'form.submitted'} eq 'scantron') &&       $ENV{'form.submitted'} eq 'scantron') &&
     $tag eq 'numericalresponse') {      $tag eq 'numericalresponse') {
     $expression.=';my $__LC__sig=undef;';      delete($$args_ref{'sig'});
  }   }
   
  if ($tag eq 'formularesponse') {   if ($tag eq 'formularesponse') {
     $expression.=';my $__LC__type="fml";';      $$args_ref{'type'}='fml';
  } elsif ($tag eq 'numericalresponse') {   } elsif ($tag eq 'numericalresponse') {
     $expression.=';my $__LC__type="float";';      $$args_ref{'type'}='float';
  }   }
  $expression.="');";  
  my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  &Apache::lonxml::debug('answer is'.join(':',@answer));   &Apache::lonxml::debug('answer is'.join(':',@answer));
  @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;   @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
   
  $result = &Apache::run::run($expression,$safeeval);   ($result,my @msgs) = 
  my ($awards) = split /:/ , $result;      &Apache::run::run("&caparesponse_check_list()",$safeeval);
  ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  &Apache::lonxml::debug("$expression");   my ($awards)=split(/:/,$result);
    my (@awards) = split(/,/,$awards);
    ($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    &Apache::lonxml::debug('ad is'.$ad);
    if ($ad eq 'SIG_FAIL') {
       my ($sig_u,$sig_l)=
    &get_sigrange($Apache::inputtags::params{'sig'});
       $msg=join(':',$msg,$sig_l,$sig_u);
       &Apache::lonxml::debug("sigs bad $sig_u $sig_l ".
      $Apache::inputtags::params{'sig'});
    }
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  &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::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
  $result='';   $result='';
     }      }
  }   }
Line 260  sub end_numericalresponse { Line 271  sub end_numericalresponse {
     my $cou=0;      my $cou=0;
     $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';      $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     for (my $i=0;$i<$number_of_tables;$i++) {      for (my $i=0;$i<$number_of_tables;$i++) {
  $result.='\vskip -1 mm \noindent \begin{tabular}{';   $result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{';
  for (my $ind=0;$ind<$table_range[$j];$ind++) {   for (my $ind=0;$ind<$table_range[$j];$ind++) {
     $result.='p{3 mm}p{'.$celllength.' mm}';      $result.='p{3 mm}p{'.$celllength.' mm}';
  }   }
Line 298  sub end_numericalresponse { Line 309  sub end_numericalresponse {
     push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);      push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
  }   }
  if (scalar(@$tagstack)) {   if (scalar(@$tagstack)) {
     &Apache::response::setup_params($tag);      &Apache::response::setup_params($tag,$safeeval);
  }   }
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
Line 330  sub end_numericalresponse { Line 341  sub end_numericalresponse {
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }   if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
  if ($sighigh && $tag eq 'numericalresponse') {   if (defined($sighigh) && $tag eq 'numericalresponse') {
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig $siglow - $sighigh";   $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
Line 516  sub get_sigrange { Line 527  sub get_sigrange {
  $sig_ubound =15; #SIG_UB_DEFAULT   $sig_ubound =15; #SIG_UB_DEFAULT
     } else {      } else {
  ($sig_lbound,$sig_ubound) = split(/,/,$sig);   ($sig_lbound,$sig_ubound) = split(/,/,$sig);
  if (!$sig_lbound) {   if (!defined($sig_lbound)) {
     $sig_lbound = 0; #SIG_LB_DEFAULT      $sig_lbound = 0; #SIG_LB_DEFAULT
     $sig_ubound =15; #SIG_UB_DEFAULT      $sig_ubound =15; #SIG_UB_DEFAULT
  }   }
  if (!$sig_ubound) { $sig_ubound=$sig_lbound; }   if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; }
     }      }
     if (($sig_ubound<$sig_lbound) ||      if (($sig_ubound<$sig_lbound) ||
  ($sig_lbound > 15) ||   ($sig_lbound > 15) ||
Line 582  sub end_stringresponse { Line 593  sub end_stringresponse {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {      if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
  &Apache::response::setup_params('stringresponse');   &Apache::response::setup_params('stringresponse',$safeeval);
  $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
  if ($Apache::lonhomework::type eq 'exam' ||   if ($Apache::lonhomework::type eq 'exam' ||
     $ENV{'form.submitted'} eq 'scantron') {      $ENV{'form.submitted'} eq 'scantron') {
Line 594  sub end_stringresponse { Line 605  sub end_stringresponse {
     $part,$id);      $part,$id);
  &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>");
   
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=   $Apache::lonhomework::results{"resource.$part.$id.submission"}=
     $response;      $response;
  my $ad;   my ($ad,$msg);
  if ($type eq 're' ) {    if ($type eq 're' ) { 
     # if the RE wasn't in a var it likely got munged,      # if the RE wasn't in a var it likely got munged,
                     # thus grab it from the var directly                      # thus grab it from the var directly
Line 605  sub end_stringresponse { Line 615  sub end_stringresponse {
 #    if ($testans !~ m/^\s*\$/) {  #    if ($testans !~ m/^\s*\$/) {
 # $answer=$token->[2]->{'answer'};  # $answer=$token->[2]->{'answer'};
 #    }  #    }
     ${$safeeval->varglob('LONCAPA_INTERNAL_response')}=      ${$safeeval->varglob('LONCAPA::response')}=$response;
  $response;      $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
     $result = &Apache::run::run('return $LONCAPA_INTERNAL_response=~m'.$answer,$safeeval);  
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
  } else {   } else {
     $response =~ s/\\/\\\\/g;      my $args_ref= 
     $response =~ s/\'/\\\'/g;   \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
   
       $$args_ref{'response'}=$response;
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     my $expression="&caparesponse_check_list('".$response."','".      $$args_ref{'type'}=
  $$parstack[-1];   &Apache::lonxml::get_param('type',$parstack,$safeeval);
     foreach my $key (keys(%Apache::inputtags::params)) {      foreach my $key (keys(%Apache::inputtags::params)) {
  $expression.= ';my $'. #'   $$args_ref{$key}=$Apache::inputtags::params{$key};
     $key.'="'.$Apache::inputtags::params{$key}.'"';  
     }      }
     $expression.="');";  
     &Apache::lonxml::debug('answer is'.join(':',$answer));      &Apache::lonxml::debug('answer is'.join(':',$answer));
     @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=($answer);      @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
     $result = &Apache::run::run($expression,$safeeval);      ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
     my ($awards) = split /:/ , $result;      &Apache::lonxml::debug('msgs are'.join(':',@msgs));
     ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);      my ($awards)=split(/:/,$result);
     &Apache::lonxml::debug("$expression");      my (@awards) = split(/,/,$awards);
       ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  }   }
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
    $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
Line 659  sub end_stringresponse { Line 670  sub end_stringresponse {
     push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");      push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
     $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';      $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
  }   }
  &Apache::response::setup_params('stringresponse');   &Apache::response::setup_params('stringresponse',$safeeval);
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header('stringresponse');      $result.=&Apache::response::answer_header('stringresponse');
  }   }
Removed from v.1.139  
changed lines
  Added in v.1.145

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