Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.72 and 1.75

version 1.72, 2002/11/13 23:37:56 version 1.75, 2002/12/02 17:06:09
Line 113  sub start_numericalresponse { Line 113  sub start_numericalresponse {
     }      }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalresponse');      $result=&Apache::response::meta_package_write('numericalresponse');
     } elsif ($target eq 'answer' || $target eq 'grade') {
         &Apache::response::reset_params();
   }    }
   return $result;    return $result;
 }  }
Line 120  sub start_numericalresponse { Line 122  sub start_numericalresponse {
 sub end_numericalresponse {  sub end_numericalresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
     if (!$Apache::lonxml::default_homework_loaded) {
         &Apache::lonxml::default_homework_load($safeeval);
     }
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
       &Apache::response::setup_params($$tagstack[-1]);        &Apache::response::setup_params($$tagstack[-1]);
Line 128  sub end_numericalresponse { Line 133  sub end_numericalresponse {
       my $id = $Apache::inputtags::response['-1'];        my $id = $Apache::inputtags::response['-1'];
       my $response = $ENV{'form.HWVAL'.$id};        my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  if (!$Apache::lonxml::default_homework_loaded) {  
     &Apache::lonxml::default_homework_load($safeeval);  
  }  
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("submitted a $response<br>\n");
Line 173  sub end_numericalresponse { Line 175  sub end_numericalresponse {
  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{';    #$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 191  sub end_numericalresponse { Line 193  sub end_numericalresponse {
      &Apache::lonxml::debug("no format answer :$answer:");       &Apache::lonxml::debug("no format answer :$answer:");
      $formatted="$answer,";       $formatted="$answer,";
    }     }
    if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);}     if ($target eq 'tex') {
      $result.=$formatted;         $formatted='';
            }         #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
      }
      $result.=$formatted;
          }
    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);       #$result.=&Apache::lonxml::latex_special_symbols($unit);
      $result.="}. \\vskip 0 mm ";       #$result.="}. \\vskip 0 mm ";
    }     }
        }         }
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
Line 358  sub end_numericalresponse { Line 363  sub end_numericalresponse {
       }        }
   }    }
   if ($target eq 'answer') {    if ($target eq 'answer') {
       if ($high) { $ans.=' ['.$low.','.$high.'] '; }        if ($high) { $ans.=' ['.$low.','.$high.']'; }
       if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }        if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);        $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
   } elsif ($target eq 'analyze') {    } elsif ($target eq 'analyze') {
       push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },        push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },

Removed from v.1.72  
changed lines
  Added in v.1.75


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