[BACK]Return to rankresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/rankresponse.pm between versions 1.42 and 1.50

version 1.42, 2004/12/04 00:41:26 version 1.50, 2007/02/22 01:25:31
Line 105  sub end_foilgroup { Line 105  sub end_foilgroup {
  if (!defined($tol)) { $tol=0; }   if (!defined($tol)) { $tol=0; }
  if ($target eq 'web' || $target eq 'tex') {   if ($target eq 'web' || $target eq 'tex') {
     $result=&displayfoils($target,$max,$randomize,$tol);      $result=&displayfoils($target,$max,$randomize,$tol);
       $Apache::lonxml::post_evaluate=0;
  } elsif ($target eq 'answer' ) {   } elsif ($target eq 'answer' ) {
     $result=&displayanswers($max,$randomize,$tol);      $result=&displayanswers($max,$randomize,$tol);
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
Line 166  sub displayanswers { Line 167  sub displayanswers {
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &whichfoils($max,$randomize);      my @whichfoils = &whichfoils($max,$randomize);
     my $result=&Apache::response::answer_header('rankresponse');  
     my @correctorder=&get_correct_order($tol,@whichfoils);      my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $order (@correctorder) {      my $result;
  $result.=&Apache::response::answer_part('rankresponse',$order);      if ($Apache::lonhomework::type eq 'exam') {
    my @alphabet = ('A'..'Z');
    my $i=0;
    foreach my $order (@correctorder) {
       $result.=&Apache::response::answer_header('rankresponse',$i++);
       $result.=&Apache::response::answer_part('rankresponse',
       $alphabet[$order-1]);
       $result.=&Apache::response::answer_part('rankresponse',$order);
       $result.=&Apache::response::answer_footer('rankresponse');
    }
       } else {
    $result=&Apache::response::answer_header('rankresponse');
    foreach my $order (@correctorder) {
       $result.=&Apache::response::answer_part('rankresponse',$order);
    }
    $result.=&Apache::response::answer_footer('rankresponse');
     }      }
     $result.=&Apache::response::answer_footer('rankresponse');  
     return $result;      return $result;
 }  }
   
 sub check_response_order {  sub check_response_order {
     my (%responsehash)=@_;      my (%responsehash)=@_;
     my @order=sort(values(%responsehash));      my @order=sort( {$a <=> $b} values(%responsehash));
     my $lastvalue=0;      my $lastvalue=0;
     my $expected=1;      my $expected=1;
     my $malformed=0;      my $malformed=0;
Line 195  sub check_response_order { Line 209  sub check_response_order {
 sub grade_response {  sub grade_response {
     my ($max,$randomize,$tol)=@_;      my ($max,$randomize,$tol)=@_;
     my (@whichfoils)=&whichfoils($max,$randomize);      my (@whichfoils)=&whichfoils($max,$randomize);
     if (!defined($ENV{'form.submitted'})) { return; }      if (!&Apache::response::submitted()) { return; }
     my %responsehash;      my %responsehash;
     my %grade;      my %grade;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);      my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
Line 263  sub displayfoils { Line 277  sub displayfoils {
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     my $value=shift(@correctorder);      my $value=shift(@correctorder);
     if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}      if ($target eq 'web') {
     $result.=$value.':'.$text;   $result.='<br /><b>'.$value.':</b> '.$text;
       } else {
    $result.=' \strut\\\\\strut '.$value.':'.$text;
       }
  }   }
     } else {      } else {
  my $i = 0;   my $i = 0;
Line 425  sub end_foil { Line 442  sub end_foil {
  if ($value ne 'unused') {   if ($value ne 'unused') {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     &Apache::lonxml::debug("Got a name of :$name:");      &Apache::lonxml::debug("Got a name of :$name:");
     if (!$name) { $name=$Apache::lonxml::curdepth; }      if ($name eq "") {
    &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
    $name=$Apache::lonxml::curdepth;
       }
     &Apache::lonxml::debug("Using a name of :$name:");      &Apache::lonxml::debug("Using a name of :$name:");
     if (defined($Apache::response::foilnames{$name})) {      if (defined($Apache::response::foilnames{$name})) {
  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));   &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
Removed from v.1.42  
changed lines
  Added in v.1.50

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