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

Diff for /loncom/homework/matchresponse.pm between versions 1.54 and 1.58

version 1.54, 2005/06/21 21:00:55 version 1.58, 2006/04/04 22:24:08
Line 149  sub end_itemgroup { Line 149  sub end_itemgroup {
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;      $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);      my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  my $table='<table>';  
    my $table='<br /><table>'; # extra space to match what latex does.
  my $i=0;   my $i=0;
  if ($direction eq 'horizontal') { $table .='<tr>';}   if ($direction eq 'horizontal') { $table .='<tr>';}
  foreach my $name (@names) {   foreach my $name (@names) {
Line 216  sub end_item { Line 217  sub end_item {
  my $location=&Apache::lonxml::get_param('location',$parstack,   my $location=&Apache::lonxml::get_param('location',$parstack,
  $safeeval);   $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 "") { $name=$Apache::lonxml::curdepth; }
  &Apache::lonxml::debug("Using a name of :$name:");   &Apache::lonxml::debug("Using a name of :$name:");
  push @{ $Apache::response::itemgroup{'names'} }, $name;   push @{ $Apache::response::itemgroup{'names'} }, $name;
  $Apache::response::itemgroup{"$name.text"} = $text;   $Apache::response::itemgroup{"$name.text"} = $text;
Line 296  sub displayanswers { Line 297  sub displayanswers {
    $randomize,     $randomize,
   &Apache::response::showallfoils(),    &Apache::response::showallfoils(),
  \%Apache::response::foilgroup);   \%Apache::response::foilgroup);
     my $result=&Apache::response::answer_header('matchresponse');  
     my %name_letter_map;      my %name_letter_map;
     if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {      if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
  %name_letter_map=   %name_letter_map=
     %{ $Apache::response::itemgroup{'name_letter_map'} };      %{ $Apache::response::itemgroup{'name_letter_map'} };
     }      }
     foreach my $name (@whichfoils) {      my $result;
  my $value_name=$Apache::response::foilgroup{$name.'.value'};      if ($Apache::lonhomework::type eq 'exam') {
  my $letter=$name_letter_map{$value_name};   my $i=0;
  $result.=&Apache::response::answer_part('matchresponse',$letter);   foreach my $name (@whichfoils) {
       $result.=&Apache::response::answer_header('matchresponse',$i++);
       my $value_name=$Apache::response::foilgroup{$name.'.value'};
       my $letter=$name_letter_map{$value_name};
       $result.=&Apache::response::answer_part('matchresponse',$letter);
       $result.=&Apache::response::answer_footer('matchresponse');
    }
       } else {
    $result=&Apache::response::answer_header('matchresponse');
    foreach my $name (@whichfoils) {
       my $value_name=$Apache::response::foilgroup{$name.'.value'};
       my $letter=$name_letter_map{$value_name};
       $result.=&Apache::response::answer_part('matchresponse',$letter);
    }
    $result.=&Apache::response::answer_footer('matchresponse');
     }      }
     $result.=&Apache::response::answer_footer('matchresponse');  
     return $result;      return $result;
 }  }
   
Removed from v.1.54  
changed lines
  Added in v.1.58

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