[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.91 and 1.95

version 1.91, 2003/04/08 04:00:23 version 1.95, 2003/04/21 20:59:02
Line 90  sub end_numericalresponse { Line 90  sub end_numericalresponse {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &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($$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 $id = $Apache::inputtags::response['-1'];
  my $response = &Apache::response::getresponse();   if ($Apache::lonhomework::type eq 'exam' && 
  if ( $response =~ /[^\s]/) {      ($$tagstack[-1] eq 'formularesponse' ||
     my $ad;       $$tagstack[-1] eq 'stringresponse')) {
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      $increment=&Apache::response::scored_response($partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   } else {
     &Apache::lonxml::debug("submitted a $response<br>\n");      my $response = &Apache::response::getresponse();
     &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");      if ( $response =~ /[^\s]/) {
    my $ad;
     if ($ENV{'form.submitted'} eq 'scantron') {   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  &Apache::response::setrandomnumber();   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  #FIXME the 8 here is based off of number of powers need a parameter   &Apache::lonxml::debug("submitted a $response<br>\n");
  my $ind=&Math::Random::random_uniform_integer(1,0,8);   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
  if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; }  
     }   if ($ENV{'form.submitted'} eq 'scantron') {
     $response =~ s/\\/\\\\/g;      my $number_of_bubbles = 8;#default values for number of bubbles
     $response =~ s/\'/\\\'/g;      my (@formats)=&Apache::lonxml::get_param_var('format',
     &Apache::lonxml::debug("current $response");   $parstack,$safeeval);
     my $expression="&caparesponse_check_list('".$response."','".      my (@answers)=&Apache::lonxml::get_param_var('answer',
  $$parstack[-1];   $parstack,$safeeval);
     foreach my $key (keys(%Apache::inputtags::params)) {      my @values=&make_numerical_bubbles($number_of_bubbles,$target,
  $expression.= ';my $'. #'         $answers[0],$formats[0]);
     $key.'="'.$Apache::inputtags::params{$key}.'"';      $response=$values[$response];
     }   } else {
     if ($$tagstack[-1] eq 'formularesponse') {      $response =~ s/\\/\\\\/g;
  $expression.=';my $type="fml";';      $response =~ s/\'/\\\'/g;
     } elsif ($$tagstack[-1] eq 'numericalresponse') {   }
  $expression.=';my $type="float";';   &Apache::lonxml::debug("current $response");
    my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[-1];
    #no way to enter units, with radio buttons
    if ($Apache::lonhomework::type eq 'exam') {
       $expression.=';my $unit=undef;';
    }
    foreach my $key (keys(%Apache::inputtags::params)) {
       $expression.= ';my $'. #'
    $key.'="'.$Apache::inputtags::params{$key}.'"';
    }
    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;
    ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
    &Apache::lonxml::debug("$expression");
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    &Apache::response::handle_previous(\%previous,$ad);
    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
    $result='';
     }      }
     $expression.="');";  
     $result = &Apache::run::run($expression,$safeeval);  
     my ($awards) = split /:/ , $result;  
     ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);  
     &Apache::lonxml::debug("$expression");  
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");  
     &Apache::response::handle_previous(\%previous,$ad);  
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;  
     $result='';  
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
      $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 ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {   if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
   
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<br />The correct answer is ";   $result="<br />The correct answer is ";
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  #$result='\vskip 0 mm The correct answer is \\texttt{';   if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
       $result='\vskip 0 mm The correct answer is \\texttt{ ';
    }
     }      }
     for (my $i=0; $i <= $#answers; $i++) {      for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
Line 165  sub end_numericalresponse { Line 181  sub end_numericalresponse {
     &Apache::lonxml::debug("no format answer :$answer:");      &Apache::lonxml::debug("no format answer :$answer:");
     $formatted="$answer,";      $formatted="$answer,";
  }   }
    if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
       $result.=$formatted;
    }
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $formatted='';      $formatted='';
     #$formatted=&Apache::lonxml::latex_special_symbols($formatted);      #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
Line 175  sub end_numericalresponse { Line 193  sub end_numericalresponse {
     chop $result;      chop $result;
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=" $unit.<br />";   $result.=" $unit.<br />";
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  #$result.=&Apache::lonxml::latex_special_symbols($unit);   if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
  #$result.="}. \\vskip 0 mm ";      $result.=&Apache::lonxml::latex_special_symbols($unit);
       $result.="}. \\vskip 0 mm ";
    }
     }      }
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
Line 234  sub end_numericalresponse { Line 254  sub end_numericalresponse {
     $result.='\end{enumerate}';      $result.='\end{enumerate}';
  } else {   } else {
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';      $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
     my $id = $Apache::inputtags::part;      my $repetition = &Apache::response::repetition();
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");  
     my $repetition = int $weight/9;  
     if ($weight % 9 != 0) {$repetition++;}  
     $result.='\begin{enumerate}';      $result.='\begin{enumerate}';
     for (my $i=0;$i<$repetition;$i++) {      for (my $i=0;$i<$repetition;$i++) {
  $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';   $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
     }      }
     $increment=$repetition;      $increment=$repetition;
     $result.= '\end{enumerate}';      $result.= '\end{enumerate}';
Removed from v.1.91  
changed lines
  Added in v.1.95

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