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

Diff for /loncom/homework/matchresponse.pm between versions 1.4 and 1.5

version 1.4, 2003/02/20 09:55:07 version 1.5, 2003/03/17 19:54:20
Line 140  sub end_itemgroup { Line 140  sub end_itemgroup {
  }   }
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
       } elsif ($target eq 'tex') {
    my $table=' \\\\\\\\ \begin{tabular}{ll} ';
    my $i=0;
    foreach my $name (@names) {
       $table.=' '.$alphabet[$i].' & '.
    $Apache::response::itemgroup{$name.'.text'}.
       ' \\\\ ';
       $i++;
    }
    $table.=' \end{tabular} \\\\ ';
    $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }      } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     return $result;      return $result;
 }  }
Line 147  sub end_itemgroup { Line 158  sub end_itemgroup {
 sub start_item {  sub start_item {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' ) {      if ($target eq 'web' || $target eq 'tex') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $randomize=&Apache::lonxml::get_param('randomize',$parstack,   my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
Line 173  sub end_item { Line 184  sub end_item {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $text ='';      my $text ='';
     my $result = '';      my $result = '';
     if ($target eq 'web') {      if ($target eq 'web' || $target eq 'tex') {
  $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 'edit') {   $target eq 'edit' || $target eq 'tex') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  my $location=&Apache::lonxml::get_param('location',$parstack,   my $location=&Apache::lonxml::get_param('location',$parstack,
  $safeeval);   $safeeval);
Line 222  sub start_foilgroup { Line 233  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;
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
  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') {   if ($target eq 'web' || $target eq 'tex') {
     $result=&displayfoils($target,$max,$randomize);      $result=&displayfoils($target,$max,$randomize);
  } elsif ($target eq 'answer' ) {   } elsif ($target eq 'answer' ) {
     $result=&displayanswers($max,$randomize);      $result=&displayanswers($max,$randomize);
Line 356  sub displayfoils { Line 367  sub displayfoils {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
     my $letter=$name_letter_map{$value};      my $letter=$name_letter_map{$value};
     $question.='<br />'.$letter.':'.$text;      if ($target eq 'tex') {
    $question.=' \\\\ '.$letter.':'.$text;
       } else {
    $question.='<br />'.$letter.':'.$text;
       }
  }   }
     } else {      } else {
  my $i = 0;   my $i = 0;
Line 365  sub displayfoils { Line 380  sub displayfoils {
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
    my $localcount = 1;
  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};
     my $optionlist="<option></option>\n";      my $optionlist = '';
       if ($target ne 'tex') {$optionlist="<option></option>\n";} else {$optionlist=' '.$localcount.'. '; $localcount++;}
     my $option;      my $option;
     foreach $option (sort(keys(%letter_name_map))) {      foreach $option (sort(keys(%letter_name_map))) {
  if ($option eq $last_letter) {   if ($option eq $last_letter) {
     $optionlist.="<option selected=\"on\">$option</option>\n";      if ($target ne 'tex') {
    $optionlist.="<option selected=\"on\">$option</option>\n";
       }
  } else {   } else {
     $optionlist.="<option>$option</option>\n";      if ($target ne 'tex') {
    $optionlist.="<option>$option</option>\n";
       }
  }   }
     }      }
     $optionlist='<select name="HWVAL_'.      if ($target ne 'tex') {
  $Apache::inputtags::response[-1].':'.$temp.'">'.          $optionlist='<select name="HWVAL_'.
     $optionlist."</select>\n";      $Apache::inputtags::response[-1].':'.$temp.'">'.
           $optionlist."</select>\n";
       } else {
    $optionlist=$optionlist;
       }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     $question.='<br />'.$optionlist.$text."\n";      if ($target ne 'tex') {
    $question.='<br />'.$optionlist.$text."\n";
       } else {
    $question.=' \\\\ '.$optionlist.$text."\n";
               } 
     $temp++;      $temp++;
  }   }
     }      }
Line 396  sub displayfoils { Line 425  sub displayfoils {
  $result='<table><tr><td>'.$result.'</td><td>'.$question.   $result='<table><tr><td>'.$result.'</td><td>'.$question.
     '</td></tr></table>';      '</td></tr></table>';
     }      }
     $result.="<br />";      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;      return $result;
 }  }
   
Line 519  sub insert_conceptgroup { Line 548  sub insert_conceptgroup {
 sub start_foil {  sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' ) {      if ($target eq 'web' || $target eq 'tex') {
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token,"Foil");   $result=&Apache::edit::tag_start($target,$token,"Foil");
Line 551  sub end_foil { Line 580  sub end_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $text ='';      my $text ='';
     my $result = '';      my $result = '';
     if ($target eq 'web') {      if ($target eq 'web' || $target eq 'tex') {
  $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') {
  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);
Removed from v.1.4  
changed lines
  Added in v.1.5

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