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

Diff for /loncom/homework/matchresponse.pm between versions 1.19 and 1.22

version 1.19, 2003/06/30 20:23:33 version 1.22, 2003/09/15 18:13:52
Line 102  sub start_itemgroup { Line 102  sub start_itemgroup {
      $safeeval,'randomize',       $safeeval,'randomize',
      'location');       'location');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'web') {      } elsif ($target eq 'web' or $target eq 'tex') {
  $Apache::matchresponse::itemtable{'location'}=   $Apache::matchresponse::itemtable{'location'}=
     &Apache::lonxml::get_param('location',$parstack,$safeeval);      &Apache::lonxml::get_param('location',$parstack,$safeeval);
     }      }
Line 144  sub end_itemgroup { Line 144  sub end_itemgroup {
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $table=' \\\\\\\\ \begin{description} ';   my $table=' \begin{description} ';
  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++;
  }   }
  $table.=' \end{description} \strut \\\\ ';   $table.=' \end{description} \strut ';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     }      }
     return $result;      return $result;
Line 248  sub end_foilgroup { Line 247  sub end_foilgroup {
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
     &grade_response($max,$randomize);      &grade_response($max,$randomize);
  }   }
    &Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
Line 389  sub displayfoils { Line 389  sub displayfoils {
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);       my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
  my @alphabet=('A'..'Z');   my @alphabet=('A'..'Z');
  my @used_letters=sort(keys(%letter_name_map));   my @used_letters=sort(keys(%letter_name_map));
    my $internal_counter=$Apache::lonxml::counter;
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $lastopt=$lastresponse{$name};      my $lastopt=$lastresponse{$name};
     my $last_letter=$name_letter_map{$lastopt};      my $last_letter=$name_letter_map{$lastopt};
Line 428  sub displayfoils { Line 429  sub displayfoils {
     $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 -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';      $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
       $internal_counter++;
         } else {          } else {
     $question.=' \\\\ '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
  }   }
             }               } 
     $temp++;      $temp++;
Line 485  sub end_conceptgroup { Line 487  sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::matchresponse::conceptgroup=0;      $Apache::matchresponse::conceptgroup=0;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
  #if not there aren't any foils to display and thus no question   #if not there aren't any foils to display and thus no question
  if (defined(@{ $Apache::response::conceptgroup{'names'} })) {   if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      my @names = @{ $Apache::response::conceptgroup{'names'} };
Removed from v.1.19  
changed lines
  Added in v.1.22

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