Diff for /loncom/homework/optionresponse.pm between versions 1.100 and 1.135

version 1.100, 2004/02/13 21:01:11 version 1.135, 2006/03/15 17:10:49
Line 27 Line 27
 #  #
 package Apache::optionresponse;  package Apache::optionresponse;
 use strict;  use strict;
 use Apache::response;  use Apache::response();
   use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));    &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
Line 37  sub start_optionresponse { Line 39  sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   #when in a option response use these    #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   push (@Apache::lonxml::namespace,'optionresponse');    push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   %Apache::hint::option=();    %Apache::hint::option=();
     undef(%Apache::response::foilnames);
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).      $result.=&Apache::edit::start_table($token).
  "<tr><td>Multiple Option Response Question ".   "<tr><td>Multiple Option Response Question ".
Line 54  sub start_optionresponse { Line 57  sub start_optionresponse {
      $token,'4').       $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',          &Apache::edit::select_arg('Randomize Foil Order','randomize',
   ['yes','no'],$token).    ['yes','no'],$token).
           &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
     [['horizontal',&mt('Normal list')],
      ['vertical',&mt('Listed in a vertical column')]],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &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,'max','randomize');   $safeeval,'max','randomize',
    'TeXlayout');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');      $result=&Apache::response::meta_package_write('optionresponse');
Line 72  sub end_optionresponse { Line 79  sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   my $result;    my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     undef(%Apache::response::foilnames);
   return $result;    return $result;
 }  }
   
Line 85  sub start_foilgroup { Line 93  sub start_foilgroup {
   my $result='';    my $result='';
   %Apache::response::foilgroup=();    %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;    $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::pushrandomnumber();
   if ($target eq 'edit') {    if ($target eq 'edit') {
     my $optionlist="<option></option>\n";      my $optionlist="<option></option>\n";
     my $option;      my $option;
Line 106  sub start_foilgroup { Line 114  sub start_foilgroup {
         <td>Delete an Option:          <td>Delete an Option:
   <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>    <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
 ENDTABLE  ENDTABLE
       $result.= &Apache::edit::checked_arg('Print options:','texoptions',
    [ ['nochoice','Don\'t show option list'] ]
    ,$token);
     $result.= &Apache::edit::end_row();      $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();      $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';      $result.= $insertlist.'<br />';
Line 114  ENDTABLE Line 125  ENDTABLE
     my @options;      my @options;
     my $optchanged=0;      my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {      if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};        my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");        &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt-1,1);        splice(@options,$delopt-1,1);
       $optchanged=1;        $optchanged=1;
     }      }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {      if ($env{"form.$Apache::lonxml::curdepth.options"}) {
       my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};        my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
       if ($options[0]) {        if ($options[0]) {
  push(@options,$newopt);   push(@options,$newopt);
       } else {        } else {
Line 129  ENDTABLE Line 140  ENDTABLE
       }        }
       $optchanged=1;        $optchanged=1;
     }      }
     if ($optchanged) {      my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
    ('texoptions'));
       if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";        $result = "<foilgroup options=\"(";
       foreach my $option (@options) {        foreach my $option (@options) {
  $option=~s/\'/\\\'/g;   $option=~s/\'/\\\'/g;
Line 137  ENDTABLE Line 150  ENDTABLE
  $result .="'".$option."',";   $result .="'".$option."',";
       }        }
       chop $result;        chop $result;
       $result.=')">';        $result.=')" ';
         $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
         $result .= '>';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= ' \begin{enumerate} ';        $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
                      \begin{enumerate} ';
   }    }
   return $result;    return $result;
 }  }
Line 156  sub end_foilgroup { Line 172  sub end_foilgroup {
     my $name;      my $name;
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
       &Apache::lonxml::debug("options:".join(':',@opt));
   
       my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
        -2,0);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}      if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");      &Apache::lonxml::debug("Options are $#opt");
     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,@opt);        $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
     } 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') {
Line 172  sub end_foilgroup { Line 192  sub end_foilgroup {
  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";   my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
  push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);   push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {        if ( &Apache::response::submitted()) {
  my @whichopt = &whichfoils($max,$randomize);   my @whichopt = &whichfoils($max,$randomize);
  my $temp=1;my $name;   my $temp=1;my $name;
  my %responsehash;   my %responsehash;
Line 182  sub end_foilgroup { Line 202  sub end_foilgroup {
  my $ignored=0;   my $ignored=0;
  foreach $name (@whichopt) {   foreach $name (@whichopt) {
   my $response=&Apache::response::getresponse($temp);    my $response=&Apache::response::getresponse($temp);
   if ($ENV{'form.submitted'} eq 'scantron') {    if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
       $response = $opt[$response];        $response = $opt[$response];
   }    }
   if ( $response =~ /[^\s]/) {    if ( $response =~ /[^\s]/) {
Line 210  sub end_foilgroup { Line 230  sub end_foilgroup {
     $responsestr;      $responsestr;
  $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;   $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$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 228  sub end_foilgroup { Line 257  sub end_foilgroup {
  } else {   } else {
     my $ad;      my $ad;
     if ($wrong==0 && $right==0) {      if ($wrong==0 && $right==0) {
  #nothing submitted   #nothing submitted only assign a score if we 
    #need to override a previous grade
    if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
       $ad='ASSIGNED_SCORE';
    }
     } else {      } else {
  $ad='ASSIGNED_SCORE';   $ad='ASSIGNED_SCORE';
     }      }
Line 247  sub end_foilgroup { Line 280  sub end_foilgroup {
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= '\end{enumerate}';        $result .= '\end{enumerate}';
   }    }
     &Apache::response::poprandomnumber();
   return $result;    return $result;
 }  }
   
Line 268  sub whichfoils { Line 302  sub whichfoils {
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,$randomize,@opt)=@_;      my ($max,$randomize,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}      if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt = &whichfoils($max,$randomize);      my @whichopt = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('optionresponse');      my $result;
   foreach my $name (@whichopt) {      if ($Apache::lonhomework::type eq 'exam') {
     $result.=&Apache::response::answer_part('optionresponse',   my $i = 0;
      $Apache::response::foilgroup{$name.'.value'})   my %opt = map { ($_,$i++) } @opt;
   }  
   $result.=&Apache::response::answer_footer('optionresponse');   $i = 0;
   return $result;   my @alphabet = ('A'..'Z');
    foreach my $name (@whichopt) {
       $result.=&Apache::response::answer_header('optionresponse',$i++);
       $result.=&Apache::response::answer_part('optionresponse',
       $alphabet[$opt{$Apache::response::foilgroup{$name.'.value'}}]);
       $result.=&Apache::response::answer_part('optionresponse',
       $Apache::response::foilgroup{$name.'.value'});
       $result.=&Apache::response::answer_footer('optionresponse');
    }
       } else {
    $result=&Apache::response::answer_header('optionresponse');
    foreach my $name (@whichopt) {
       $result.=&Apache::response::answer_part('optionresponse',
       $Apache::response::foilgroup{$name.'.value'});
    }
    $result.=&Apache::response::answer_footer('optionresponse');
       }
       return $result;
   }
   
   sub check_for_invalid {
       my ($names,$options) = @_;
       my %bad_names;
       foreach my $name (@{ $names }) {
    my $value=$Apache::response::foilgroup{$name.'.value'};
    my $found=0;
    foreach my $option (@{ $options }) {
       if ($value eq $option) { $found=1; }
    }
    if (!$found) { $bad_names{$name}=$value; }
       }
       if (%bad_names) {
    my $error=&mt('The question can not be gotten correct, '.
       'the following foils in the &lt;optionresponse&gt; '.
       'have invalid correct options').' <br /><tt>'.
       join('<br />',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))).
       "</tt>";
    &Apache::lonxml::error($error);
       }
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$randomize,@opt)=@_;    my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my $result;      my $result;  
   my $name;    my $name;
   my $displayoptionintex=0;    my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');    my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);    my @whichopt = &whichfoils($max,$randomize);
     &check_for_invalid(\@whichopt,\@opt);
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];    my $id=$Apache::inputtags::response[-1];
   my $break;    my $break;
Line 303  sub displayfoils { Line 376  sub displayfoils {
  my $text=$Apache::response::foilgroup{$name.'.text'};   my $text=$Apache::response::foilgroup{$name.'.text'};
  my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});   my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
  my $lastopt=$lastresponse{$name};   my $lastopt=$lastresponse{$name};
  if ($text!~/^\s*$/) {   if ($text!~/^\s*$/) { $break='<br />'; }
     if ($target eq 'tex') {  
  $break='\vskip 0 mm ';  
     } elsif ($target eq 'web') {  
  $break='<br />';  
     }  
  }  
  $result.=$break;   $result.=$break;
  if ($target eq 'web') {   if ($target eq 'web') {
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
Line 317  sub displayfoils { Line 384  sub displayfoils {
  if ($text=~/^\s*$/) {   if ($text=~/^\s*$/) {
     $text=$value.$text;      $text=$value.$text;
  } else {   } else {
     $text=$value.': '.$text;      $text='<b>'.$value.':</b> '.$text;
  }   }
     } else {      } else {
  $text='&#149;'.$text;   $text='&#149;'.$text;
     }      }
     $result.=$text."\n";      $result.=$text."\n";
       } elsif ($target eq 'tex') {   }
   $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;  
   if ($max>1) {$result .='\item ';}  
    $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.  
       ":".$Apache::response::foilgroup{$name.'.text'}."\n";  
       }  
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
  if ($target ne 'tex') {  
   $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);    $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
         } else {  
   $result.=&bubbles(\@alphabet,\@opt);  
         }  
       }        }
       $temp++;        $temp++;
     }      }
Line 353  sub displayfoils { Line 411  sub displayfoils {
       }        }
       my $lastopt=$lastresponse{$name};        my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";        my $optionlist="<option></option>\n";
       my $option;        foreach my $option (@opt) {
       foreach $option (@opt) {    my $escopt=&HTML::Entities::encode($option,'\'"&<>');
  if ($option eq $lastopt) {    if ($option eq $lastopt) {
   $optionlist.="<option selected=\"on\">$option</option>\n";        $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
  } else {    } else {
   $optionlist.="<option>$option</option>\n";        $optionlist.="<option value='".$escopt."'>$option</option>\n";
  }    }
       }        }
       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 name="HWVAL_'.
       $Apache::inputtags::response['-1'].':'.$temp.'">'.    $Apache::inputtags::response['-1'].':'.$temp.'">'.
   $optionlist."</select>\n";    $optionlist."</select>\n";
     } else {
         $optionlist='<u>'.('&nbsp;'x10).'</u>';
   }    }
   my $text=$Apache::response::foilgroup{$name.'.text'};    if ($text=~s|<drawoptionlist\s*/>|$optionlist|) {
   if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {        if ($Apache::lonhomework::type ne 'exam') {
       $text=$optionlist.$text;    $text='&#149;'.$text;
         }
   } else {    } else {
       $text='&#149;'.$text;        if ($Apache::lonhomework::type ne 'exam') {
     $text=$optionlist.$text;
         }
   }    }
   $result.=$break.$text."\n";    $result.=$break.$text."\n";
   if ($Apache::lonhomework::type eq 'exam') {    if ($Apache::lonhomework::type eq 'exam') {
     $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);        $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
   }    }
   $temp++;    $temp++;
       } else {        } else {
           my $texoptionlist = &optionlist_correction($optionlist);    my $texoptionlist='';
   if ($displayoptionintex == 0) {    if ($displayoptionintex &&
       if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist        $Apache::lonhomework::type ne 'exam') {
       if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {        $texoptionlist = &optionlist_correction($TeXlayout,@opt);
  if ($Apache::lonhomework::type eq 'exam') {    }
           $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;    if ($text=~/<drawoptionlist\s*\/>/) {
         }        $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
         if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {    }
           $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;  
         }    if ($text=~m/\\item /) {
  $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};  
       } else {  
   if ($Apache::lonhomework::type eq 'exam') {  
       $result.= $texoptionlist.'  '.$Apache::response::foilgroup{$name.'.text'};  
   } else {  
       $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};  
   }  
       }  
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';            $text=~s/\\item/\\vskip 2 mm/;
   $internal_counter++;  
       }        }
       $displayoptionintex=1;        $result.= $texoptionlist.$text;
   } else {    } else {
       if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {  
   if ($Apache::lonhomework::type eq 'exam') {  
       $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;  
   }  
         if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {  
           $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;  
         }  
  $result.= $Apache::response::foilgroup{$name.'.text'};  
       } else {  
   if ($Apache::lonhomework::type eq 'exam') {  
       $result.= '  '.$Apache::response::foilgroup{$name.'.text'};  
   } else {  
       $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};  
   }  
       }  
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.='\vskip -1 mm \noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';    $result.= $texoptionlist.'  '.$text;
   $internal_counter++;        } else {
     if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}
       }        }
   }    }
     if ($Apache::lonhomework::type eq 'exam') {
         $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
     $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
     '\end{enumerate} \vskip -8 mm \strut ';
         $internal_counter++;
     }
     $displayoptionintex=0;
       }        }
     }      }
   }    }
Line 435  sub displayfoils { Line 482  sub displayfoils {
   
   
 sub optionlist_correction {  sub optionlist_correction {
       my ($TeXlayout,@options) = @_;
     my $texoptionlist = shift;      my $texoptionlist='\\item [] Choices: ';
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {      if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
  $texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;      if (scalar(@options) > 0) {
  $texoptionlist =~ s/<option>/\{\\bf /g;   foreach my $option (@options) {
  $texoptionlist =~ s/<option selected="on">/\{\\bf /g;      $texoptionlist.='{\bf '.
  $texoptionlist =~ s/<\/option>/\},/g;   &Apache::lonxml::latex_special_symbols($option).
  $texoptionlist =~ s/,$/\./g;   '}';
  $texoptionlist =~ s/>/\$>\$/g;      if ($TeXlayout eq 'vertical') {
  $texoptionlist =~ s/</\$<\$/g;   $texoptionlist.=' \vskip 0 mm ',
  $texoptionlist =~ s/=/\$=\$/g;      } else {
  $texoptionlist =~ s/\^(\d+)/\$^{$1}\$/g;   $texoptionlist.=', ';
       }
    }
    $texoptionlist=~s/, $//;
    if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
     } else {      } else {
  $texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;   if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
     }      }
     return $texoptionlist;      return $texoptionlist;
 }  }
   
   
 sub webbubbles {  sub webbubbles {
   
     my ($ropt,$ralphabet,$temp,$lastopt)=@_;      my ($ropt,$ralphabet,$temp,$lastopt)=@_;
     my @opt=@$ropt;       my @opt=@$ropt; 
     my @alphabet=@$ralphabet;      my @alphabet=@$ralphabet;
Line 469  sub webbubbles { Line 519  sub webbubbles {
  }   }
  $result.='<td><input type="radio" name="HWVAL_'.   $result.='<td><input type="radio" name="HWVAL_'.
     $Apache::inputtags::response['-1'].':'.$temp.      $Apache::inputtags::response['-1'].':'.$temp.
     '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.      '" value="'.$opt[$ind].'" '.$checked.' />';
     $opt[$ind].'</td>';   if ($alphabet[$ind]) {
       $result.=$alphabet[$ind].': ';
    }
    $result.=$opt[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
     return $result;      return $result;
Line 478  sub webbubbles { Line 531  sub webbubbles {
   
   
 sub bubbles {  sub bubbles {
       my ($ralphabet,$ropt,$response) = @_;
     my ($ralphabit,$ropt) = @_;      my @alphabet = @$ralphabet;
     my @alphabet = @$ralphabit;  
     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 ($env{'form.textwidth'} ne '') {
  $ENV{'form.textwidth'}=~/(\d+)/;   $env{'form.textwidth'}=~/(\d+)/;
  $textwidth=$1;   $textwidth=$1;
     } else {      } else {
  $ENV{'textwidth'}=~/(\d+)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1;   $textwidth=$1.'.'.$2;
     }      }
     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]);
    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])+3)*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].'} & ';
     $head.='lr';      $head.='lr';
  } else {   } else {
     $line=~s/\&\s*$//;      $line=~s/\&\s*$//;
     $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';      $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
     $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].'} & ';;
     $head ='lr';      $head ='lr';
     $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;      $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
Line 556  sub start_foil { Line 610  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' || $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 587  sub end_foil { Line 644  sub end_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') { 
       $text=&Apache::lonxml::endredirection;        $text=&Apache::lonxml::endredirection;
       if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }        if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;}
         if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} 
   }    }
   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') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
       if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
    $text='\vskip 5mm $\triangleright$ '.$text;
       }
     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);
       my $location =&Apache::lonxml::get_param('location',$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 eq "") {
     &Apache::lonxml::warning("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})) {
     &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
         }
         $Apache::response::foilnames{$name}++;
         my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       if ( $Apache::optionresponse::conceptgroup        if ( $Apache::optionresponse::conceptgroup
    && !&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' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::conceptgroup{"$name.text"} = $text;
     $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\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 ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   $Apache::response::foilgroup{"$name.text"} = $text;
     $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;  
  } else {  
     $Apache::response::foilgroup{"$name.text"} = $text;  
  }  
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
     }      }
Line 626  sub end_foil { Line 686  sub end_foil {
   return $result;    return $result;
 }  }
   
   sub start_drawoptionlist {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($target ne 'meta') {
    return $token->[4];
       }
   }
   
   sub end_drawoptionlist {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($target ne 'meta') {
    return $token->[2];
       }
   }
   
 sub insert_foil {  sub insert_foil {
   return '    return '
 <foil name="" value="unused">  <foil name="" value="unused">

Removed from v.1.100  
changed lines
  Added in v.1.135


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.