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

Diff for /loncom/homework/optionresponse.pm between versions 1.134 and 1.141

version 1.134, 2006/03/15 00:08:53 version 1.141, 2007/04/06 16:54:48
Line 183  sub end_foilgroup { Line 183  sub end_foilgroup {
        $safeeval,'-2');         $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
       $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);        $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
         $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {      } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);        $result.=&displayanswers($max,$randomize,@opt);
         
     } elsif ( $target eq 'analyze') {      } elsif ( $target eq 'analyze') {
  my @shown = &whichfoils($max,$randomize);   my @shown = &whichfoils($max,$randomize);
  &Apache::response::analyze_store_foilgroup(\@shown,   &Apache::response::analyze_store_foilgroup(\@shown,
Line 353  sub check_for_invalid { Line 355  sub check_for_invalid {
     }      }
 }  }
   
   sub setup_prior_tries_hash {
       my ($whichopt) = @_;
       my $part=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       foreach my $i (1..$Apache::lonhomework::history{'version'}) {
    my $key = "$i:resource.$part.$id.submission";
    next if (!exists($Apache::lonhomework::history{"$key"}));
    my %lastresponse=
       &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
    my $output;
    foreach my $name (@$whichopt) {
       next if (!defined($lastresponse{$name}));
       $output .= '<td>'.$lastresponse{$name}.'</td>';
    }
    next if (!defined($output));
    $output =
       '<table class="LC_optres_prior"><tr>'.$output.'</tr></table>';
    $Apache::inputtags::submission_display{$key} = $output;
       }
   }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,@opt)=@_;    my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
Line 421  sub displayfoils { Line 444  sub displayfoils {
       }        }
       if ($target ne 'tex') {        if ($target ne 'tex') {
   if ($Apache::lonhomework::type ne 'exam') {    if ($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";
   } else {    } else {
Line 448  sub displayfoils { Line 472  sub displayfoils {
       $texoptionlist = &optionlist_correction($TeXlayout,@opt);        $texoptionlist = &optionlist_correction($TeXlayout,@opt);
   }    }
   if ($text=~/<drawoptionlist\s*\/>/) {    if ($text=~/<drawoptionlist\s*\/>/) {
       $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;        $text=~s|<drawoptionlist\s*\/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g;
   }    }
   
   if ($text=~m/\\item /) {    if ($text=~m/\\item /) {
Line 473  sub displayfoils { Line 497  sub displayfoils {
       }        }
     }      }
   }    }
   
     if ($target eq 'web') {
         &setup_prior_tries_hash(\@whichopt);
     }
   
   if ($target ne 'tex') {    if ($target ne 'tex') {
       return $result.$break;        return $result.$break;
   } else {    } else {
Line 481  sub displayfoils { Line 510  sub displayfoils {
 }  }
   
   
 #  Correct a single option list element.  
 #  - For embedded <display></display> tags,  
 #    we pass literally the stuff between them.  
 #  - For everything else, we run through latex_special_symbols  
 #    so that any symbols that have meaning to LaTeX will be  
 #    correctly escaped.  
 #  
 sub correct_option {  
     my $option = shift;  
   
   
     # There's probably a beter way with perl if I was  
     # more of a regexp wiz..(RF).  
   
     my $strlen = length($option);  
     my $here   = 0; # Where to start searching for <display></display>  
     my $result =""; # The return string is built here.  
       
     while ($here < $strlen) {  
  # look for an opening <display> tag:  
   
  my $openloc = index($option, "<display>", $here);  
  if ($openloc == -1) {  
     # No more... operate with latex_special_symbols on  
     # the rest of the string.  
   
     $result .= &Apache::lonxml::latex_special_symbols(substr($option, $here));  
     return $result;  
  } else {  
     # Need to pass the string up to the <display> tag   
     # through l_s_s ...  
     $result .= &Apache::lonxml::latex_special_symbols(substr($option, $here, $openloc-$here));  
  }  
  # look for the closing </display> tag...  
  # We're a bit stupid..or tolerant...  
  # in that if the user forgets the </display> tag  
  # we infer they intended one at the end of the option.  
  $openloc += 9; # 9 chars in <display>  
   
  my $closeloc = index($option, "</display>", $openloc); # 9 chars in <display>  
  if ($closeloc == -1) {  
     $closeloc = $strlen + 9;                             # 10chars in </display> faked off end.   
  }  
  #  Pass from openloc through closeloc without any interpretation:  
   
  &Apache::lonnet::logthis("Segment inside display: $openloc through $closeloc");  
  $result .= substr($option, $openloc, $closeloc - $openloc);  
  $here    = $closeloc + 10;                               # Next search is after the </display>   
     }  
   
     return $result;  
   
     # return &Apache::lonxml::latex_special_symbols($option);  
 }  
   
 #  Correct the option list elements so that if there  
 #  are special symbosl that have meaning to LaTeX  
 #  they get fixed up to display correctly.  
   
 sub optionlist_correction {  sub optionlist_correction {
     my ($TeXlayout,@options) = @_;      my ($TeXlayout,@options) = @_;
     my $texoptionlist='\\item [] Choices: ';      my $texoptionlist='\\item [] Choices: ';
Line 547  sub optionlist_correction { Line 517  sub optionlist_correction {
     if (scalar(@options) > 0) {      if (scalar(@options) > 0) {
  foreach my $option (@options) {   foreach my $option (@options) {
     $texoptionlist.='{\bf '.      $texoptionlist.='{\bf '.
  &correct_option($option).   &Apache::lonxml::latex_special_symbols($option).
  '}';   '}';
     if ($TeXlayout eq 'vertical') {      if ($TeXlayout eq 'vertical') {
  $texoptionlist.=' \vskip 0 mm ',   $texoptionlist.=' \vskip 0 mm ',
Line 590  sub webbubbles { Line 560  sub webbubbles {
   
   
 sub bubbles {  sub bubbles {
     my ($ralphabet,$ropt,$response) = @_;      my ($ralphabet,$ropt,$response, $max_width) = @_;
     my @alphabet = @$ralphabet;      my @alphabet = @$ralphabet;
     my @opt = @$ropt;      my @opt = @$ropt;
     my ($result,$head,$line) =('','','');      my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;      my $current_length = 0;
     my $textwidth;      my $textwidth;
     if ($env{'form.textwidth'} ne '') {      if (defined($max_width)) {
    $textwidth=$max_width;
    &Apache::lonxml::debug("Max width passed in: $max_width");
       } elsif ($env{'form.textwidth'} ne '') {
  $env{'form.textwidth'}=~/(\d+)/;   $env{'form.textwidth'}=~/(\d+)/;
  $textwidth=$1;   $textwidth=$1;
    &Apache::lonxml::debug("Max width from form: $textwidth");
     } else {      } else {
  $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
    &Apache::lonxml::debug("Max width defaults? $textwidth");
     }      }
       &Apache::lonxml::debug("Final maxwidth: $textwidth");
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
  my $leftmargin;   my $leftmargin;
  $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);   $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
  if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}   if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
  if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}   if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
   
  $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;   $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
  if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {   if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
     $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';      $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
Line 747  sub end_foil { Line 724  sub end_foil {
   
 sub start_drawoptionlist {  sub start_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target ne 'meta') {      if (($target ne 'meta')  && ($target ne 'answer')) {
  return $token->[4];   return $token->[4];
     }      }
 }  }
   
 sub end_drawoptionlist {  sub end_drawoptionlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target ne 'meta') {      if (($target ne 'meta') && ($target ne 'answer')) {
  return $token->[2];   return $token->[2];
     }      }
 }  }
Removed from v.1.134  
changed lines
  Added in v.1.141

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.