[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.141 and 1.147

version 1.141, 2004/03/12 21:06:19 version 1.147, 2004/06/04 22:56:45
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 85  sub start_numericalresponse { Line 86  sub start_numericalresponse {
     $safeeval);      $safeeval);
     if ($unit =~ /\S/) { $result.=" (in $unit) "; }      if ($unit =~ /\S/) { $result.=" (in $unit) "; }
  }   }
    if (  &Apache::response::show_answer() ) {
       my $answertxt;
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
    $safeeval);
       my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
    $safeeval);
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
       $safeeval);
       for (my $i=0; $i <= $#answers; $i++) {
    my $answer=$answers[$i];
    my $format;
    if ($#formats > 0) {
       $format=$formats[$i];
    } else {
       $format=$formats[0];
    }
    my $formatted;
    if ((defined($format)) && ($format ne '')) {
       $format=~s/e/E/g;
       &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
       $formatted=sprintf('%.'.$format,$answer).',';
    } else {
       &Apache::lonxml::debug("no format answer :$answer:");
       $formatted="$answer,";
    }
    $answertxt.=$formatted;
       }
       chop $answertxt;
       if ($target eq 'web') {
    $answertxt.=" $unit.<br />";
       }
       $Apache::inputtags::answertxt{$id}=$answertxt;
    }
     }      }
     return $result;      return $result;
 }  }
Line 122  sub end_numericalresponse { Line 156  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,my @msgs) = &Apache::run::run($expression,$safeeval);   ($result,my @msgs) = 
       &Apache::run::run("&caparesponse_check_list()",$safeeval);
  &Apache::lonxml::debug('msgs are'.join(':',@msgs));   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  my ($awards) = split /:/ , $result;   my ($awards)=split(/:/,$result);
  ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   my (@awards) = split(/,/,$awards);
  &Apache::lonxml::debug("$expression");   ($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 175  sub end_numericalresponse { Line 218  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 (  &Apache::response::show_answer() ) {  
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,  
  $safeeval);  
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,  
     $safeeval);  
     if ($target eq 'web') {  
  $result="<br />".&mt('The correct answer is')." ";  
     }  
     for (my $i=0; $i <= $#answers; $i++) {  
  my $answer=$answers[$i];  
  my $format;  
  if ($#formats > 0) {  
     $format=$formats[$i];  
  } else {  
     $format=$formats[0];  
  }  
  my $formatted;  
  if ((defined($format)) && ($format ne '')) {  
     $format=~s/e/E/g;  
     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");  
     $formatted=sprintf('%.'.$format,$answer).',';  
  } else {  
     &Apache::lonxml::debug("no format answer :$answer:");  
     $formatted="$answer,";  
  }  
  if ($target eq 'tex') {  
     $formatted='';  
     #$formatted=&Apache::lonxml::latex_special_symbols($formatted);  
  }  
  $result.=$formatted;  
     }  
     chop $result;  
     if ($target eq 'web') {  
  $result.=" $unit.<br />";  
     }  
  }  
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
Line 261  sub end_numericalresponse { Line 268  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 331  sub end_numericalresponse { Line 338  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 510  sub get_tolrange { Line 517  sub get_tolrange {
 sub get_sigrange {  sub get_sigrange {
     my ($sig)=@_;      my ($sig)=@_;
     &Apache::lonxml::debug("Got a sig of :$sig:");      &Apache::lonxml::debug("Got a sig of :$sig:");
       my $courseid=$ENV{'request.course.id'};
       if (lc($ENV{"course.$courseid.disablesigfigs"}) eq 'yes') {
    return (15,0);
       }
     my $sig_lbound;      my $sig_lbound;
     my $sig_ubound;      my $sig_ubound;
     if ($sig eq '') {      if ($sig eq '') {
Line 517  sub get_sigrange { Line 528  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 551  sub start_stringresponse { Line 562  sub start_stringresponse {
  [['cs','Case Sensitive'],['ci','Case Insensitive'],   [['cs','Case Sensitive'],['ci','Case Insensitive'],
   ['mc','Case Insensitive, Any Order'],    ['mc','Case Insensitive, Any Order'],
   ['re','Regular Expression']],$token);    ['re','Regular Expression']],$token);
  $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',  
     [['inline','Inline']],$token);  
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
        my $constructtag;   my $constructtag;
        $constructtag=&Apache::edit::get_new_args($token,$parstack,   $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                  $safeeval,'answer',    $safeeval,'answer',
                                                  'type','answerdisplay');    'type','answerdisplay');
        if ($constructtag) {   if ($constructtag) {
            $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 'web') {
    if (  &Apache::response::show_answer() ) {
       $Apache::inputtags::answertxt{$id}=
    &Apache::lonxml::get_param('answer',$parstack,$safeeval);
    } 
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
     }      }
Line 595  sub end_stringresponse { Line 609  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 606  sub end_stringresponse { Line 619  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') {
  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 (  &Apache::response::show_answer() ) {  
     if ($target eq 'web') {  
  $result=($answerdisplay eq 'inline'?'':"<br />".&mt('The correct answer is')." ")  
     .$answer;  
 #    join(', ',@answers).".<br />";  
     }  
  }  
  if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {   if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';      $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
     $increment = &Apache::response::repetition();      $increment = &Apache::response::repetition();
Removed from v.1.141  
changed lines
  Added in v.1.147

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