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

Diff for /loncom/homework/matchresponse.pm between versions 1.45 and 1.70

version 1.45, 2004/10/07 18:06:05 version 1.70, 2008/08/08 16:37:13
Line 32  use HTML::Entities(); Line 32  use HTML::Entities();
 use Math::Random();  use Math::Random();
 use Apache::optionresponse();  use Apache::optionresponse();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 69  sub start_matchresponse { Line 70  sub start_matchresponse {
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
           $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse';
  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
    push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
         1);
     }      }
     return $result;      return $result;
 }  }
Line 101  sub start_itemgroup { Line 105  sub start_itemgroup {
    'location',     'location',
    ['top','bottom','left','right'],     ['top','bottom','left','right'],
    $token);     $token);
    $result.=&Apache::edit::select_arg('Items Display Directection:',
      'direction',
      ['vertical','horizontal'],
      $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=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'randomize',       $safeeval,'randomize',
      'location');       'location','direction');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'web' or $target eq 'tex') {      } elsif ($target eq 'web' or $target eq 'tex') {
  $Apache::matchresponse::itemtable{'location'}=   $Apache::matchresponse::itemtable{'location'}=
Line 142  sub end_itemgroup { Line 150  sub end_itemgroup {
     }      }
     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;      $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $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);
     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>';}
  foreach my $name (@names) {   foreach my $name (@names) {
     $table.='<tr><td>'.$alphabet[$i].'</td><td>'.      if ($direction ne 'horizontal') { $table.='<tr>'; }
  $Apache::response::itemgroup{$name.'.text'}.      $table.='<td>'.$alphabet[$i].'</td><td>'.
     '</td></tr>';   $Apache::response::itemgroup{$name.'.text'}.'</td>';
       if ($direction ne 'horizontal') { $table.='</tr>'; }
     $i++;      $i++;
  }   }
    if ($direction eq 'horizontal') { $table .='</tr>';}
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
    $Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';   my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
  my $i=0;   my $i=0;
  foreach my $name (@names) {   foreach my $name (@names) {
     $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;      # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
     $table.='\item['.$alphabet[$i].'] '.      $table.='\item['.$alphabet[$i].'] '.
  $Apache::response::itemgroup{$name.'.text'};   $Apache::response::itemgroup{$name.'.text'};
     $i++;      $i++;
Line 165  sub end_itemgroup { Line 179  sub end_itemgroup {
  $table.=' \end{description}  \strut ';   $table.=' \end{description}  \strut ';
  if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}   if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
    $Apache::lonxml::post_evaluate=0;
     }      }
     return $result;      return $result;
 }  }
Line 207  sub end_item { Line 222  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 247  sub start_foilgroup { Line 262  sub start_foilgroup {
 sub end_foilgroup {  sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
       my $part        = $Apache::inputtags::part;
       my $response_id = $Apache::inputtags::response[-1];
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
  my $randomize = &Apache::lonxml::get_param('randomize',$parstack,   my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
    $safeeval,'-2');     $safeeval,'-2');
  if ($target eq 'web' || $target eq 'tex') {   if ($target eq 'web' || $target eq 'tex') {
     $result=&displayfoils($target,$max,$randomize);      $result=&displayfoils($target,$max,$randomize);
       $Apache::lonxml::post_evaluate=0;
  } elsif ($target eq 'answer' ) {   } elsif ($target eq 'answer' ) {
     $result=&displayanswers($max,$randomize);      $result=&displayanswers($max,$randomize);
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
Line 263  sub end_foilgroup { Line 282  sub end_foilgroup {
  ['text','value','location']);   ['text','value','location']);
     #FIXME need to store options in some way      #FIXME need to store options in some way
  }   }
  &Apache::lonxml::increment_counter(&getfoilcounts($max));   &Apache::lonxml::increment_counter(&getfoilcounts($max), 
      "$part.$response_id");
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
    }
   
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
Line 287  sub displayanswers { Line 311  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;
 }  }
   
Line 309  sub grade_response { Line 345  sub grade_response {
    $randomize,     $randomize,
             &Apache::response::showallfoils(),              &Apache::response::showallfoils(),
            \%Apache::response::foilgroup);             \%Apache::response::foilgroup);
     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 350  sub grade_response { Line 386  sub grade_response {
  $itemstr;   $itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=      $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
  $gradestr;   $gradestr;
     if (!$Apache::lonhomework::scantronmode) {      if ($Apache::lonhomework::type eq 'survey') {
    if ($ignored == 0) {
       my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
       &Apache::response::handle_previous(\%previous,$ad);
    } elsif ($wrong==0 && $right==0) {
    } else {
       my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
       &Apache::response::handle_previous(\%previous,$ad);
    }
       } elsif (!$Apache::lonhomework::scantronmode) {
  my $ad;   my $ad;
  if ($wrong==0 && $ignored==0) {   if ($wrong==0 && $ignored==0) {
     $ad='EXACT_ANS';      $ad='EXACT_ANS';
Line 381  sub grade_response { Line 426  sub grade_response {
     }      }
 }  }
   
   sub format_prior_answer {
       my ($mode,$answer,$other_data) = @_;
       my %answer      =&Apache::lonnet::str2hash($answer);
       my $foil_order  =$other_data->[0];
       my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
       my @items       =&Apache::lonnet::str2array($other_data->[2]);
       my $output;
       
       foreach my $name (@{ $foil_order }) {
    my $item=shift(@items);
    $output .= '<tr><td>'.$item.'</td></tr>';
       }
       return if (!defined($output));
   
       $output = '<table class="LC_prior_match">'.$output.'</table>';
       return $output;
   }
   
 sub itemdisplay {  sub itemdisplay {
     my ($location)=@_;      my ($location)=@_;
     if ($location eq 'top' &&      if ($location eq 'top' &&
Line 392  sub itemdisplay { Line 455  sub itemdisplay {
     }      }
     return undef;      return undef;
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize)=@_;      my ($target,$max,$randomize)=@_;
       my ($tabsize, $lefttabsize, $righttabsize);
   
     my $result;      my $result;
     my $question;      my $question;
     my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
Line 420  sub displayfoils { Line 486  sub displayfoils {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $question.=' \\\\ '.$letter.':'.$text;   $question.=' \\\\ '.$letter.':'.$text;
     } else {      } else {
  $question.='<br />'.$letter.':'.$text;   $question.='<br /><b>'.$letter.':</b> '.$text;
     }      }
  }   }
     } else {      } else {
Line 453  sub displayfoils { Line 519  sub displayfoils {
  }   }
     }      }
     if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {      if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
         $optionlist='<select name="HWVAL_'.          $optionlist='<select onchange="javascript:setSubmittedPart(\''.
     $part.'\');" name="HWVAL_'.
     $Apache::inputtags::response[-1].':'.$temp.'">'.      $Apache::inputtags::response[-1].':'.$temp.'">'.
         $optionlist."</select>\n";          $optionlist."</select>\n";
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
       #
               #  Factor out the tex computations of the left/right 1/2 minipage
       #  widths for left or right positioning.  This allows us
       #  to, if necessary constrain the bubble widths:
       #
       if ($target eq 'tex'   &&
    (&itemdisplay('left') || &itemdisplay('right'))) {
    $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
    ($lefttabsize,$righttabsize)=(0,0);
    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
       $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
       $lefttabsize=$tabsize*$1/100;
       $righttabsize=0.95*($tabsize-$lefttabsize);
    } else {
       $tabsize=~/(\d+\.?\d*)/;
       $lefttabsize=$1/2.1;
       $righttabsize=0.95*($1-$lefttabsize);
    }
       }
     if ($target ne 'tex') {      if ($target ne 'tex') {
  if ($Apache::lonhomework::type ne 'exam') {   if ($Apache::lonhomework::type ne 'exam') {
     $question.="<br />\n".$optionlist.$text;      $question.="<br />\n".$optionlist.$text;
Line 469  sub displayfoils { Line 555  sub displayfoils {
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
  }   }
     } else {      } else {
    # Note that if left or right positioned, we must
    # confine the bubbles to righttabsize:
    #
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     my @emptyItems = ();      my @emptyItems = ();
     for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}      for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
     $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';      $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
    .'\item \hskip -3mm \textbf{'.$internal_counter.'}';
       if (&itemdisplay('left') || &itemdisplay('right')) {
    $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
       }
       else {
    $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
       }
       $question .= '\end{list} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
Line 493  sub displayfoils { Line 590  sub displayfoils {
     $result='<table><tr><td valign="top">'.$question.      $result='<table><tr><td valign="top">'.$question.
  '</td><td valign="top">'.$result.'</td></tr></table>';   '</td><td valign="top">'.$result.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});  
     my ($lefttabsize,$righttabsize)=(0,0);  
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {  
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;  
  $lefttabsize=$tabsize*$1/100;  
  $righttabsize=0.95*($tabsize-$lefttabsize);  
     } else {  
  $tabsize=~/(\d+\.?\d*)/;  
  $lefttabsize=$1/2.1;  
  $righttabsize=0.95*($1-$lefttabsize);  
     }  
     $lefttabsize.=' mm ';      $lefttabsize.=' mm ';
     $righttabsize.=' mm ';      $righttabsize.=' mm ';
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';      $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
Line 515  sub displayfoils { Line 601  sub displayfoils {
     $result='<table><tr><td valign="top">'.$result.      $result='<table><tr><td valign="top">'.$result.
  '</td><td valign="top">'.$question.'</td></tr></table>';   '</td><td valign="top">'.$question.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});  
     my ($lefttabsize,$righttabsize)=(0,0);  
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {  
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;  
  $lefttabsize=$tabsize*$1/100;  
  $righttabsize=0.95*($tabsize-$lefttabsize);  
     } else {  
  $tabsize=~/(\d+\.?\d*)/;  
  $lefttabsize=$1/2.1;  
  $righttabsize=0.95*($1-$lefttabsize);  
     }  
     $lefttabsize.=' mm ';      $lefttabsize.=' mm ';
     $righttabsize.=' mm ';      $righttabsize.=' mm ';
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';      $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
  }   }
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
     [\@whichfoils,
      'submissiongrading',
      'submissionitems']);
       }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;      return $result;
 }  }
Line 591  sub start_foil { Line 672  sub start_foil {
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
    if ($target eq 'analyze') {
       &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
    }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token,"Foil");   $result=&Apache::edit::tag_start($target,$token,"Foil");
  my $level='-2';   my $level='-2';
Line 624  sub end_foil { Line 708  sub end_foil {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
  $text=&Apache::lonxml::endredirection;   $text=&Apache::lonxml::endredirection;
     }      }
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
       $text='\vskip 5mm $\triangleright$ '.$text;
    }
  my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);   my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
  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) {
    &Apache::lonxml::warning(&mt('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 [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
     }      }
     $Apache::response::foilnames{$name}++;      $Apache::response::foilnames{$name}++;
     my $location =&Apache::lonxml::get_param('location',$parstack,      my $location =&Apache::lonxml::get_param('location',$parstack,
Line 642  sub end_foil { Line 733  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {   $Apache::response::conceptgroup{"$name.text"} = $text;
     $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;  
  } else {  
     $Apache::response::conceptgroup{"$name.text"} = $text;  
  }  
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  if ($Apache::lonhomework::type eq 'exam') {   $Apache::response::foilgroup{"$name.text"} = $text;
     if ($target eq 'tex') {  
  $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }  
  } else {  
     if ($target eq 'tex') {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }  
  }  
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.45  
changed lines
  Added in v.1.70

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