--- loncom/homework/optionresponse.pm 2002/07/16 21:02:29 1.42
+++ loncom/homework/optionresponse.pm 2002/08/26 18:15:22 1.46
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.42 2002/07/16 21:02:29 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.46 2002/08/26 18:15:22 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -76,12 +76,12 @@ sub end_optionresponse {
return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::optionresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
if ($target eq 'edit') {
@@ -140,10 +140,6 @@ ENDTABLE
}
if ($target eq 'tex') {
$result .= ' \begin{enumerate} ';
- my $option_list = &Apache::lonxml::get_param('options',$parstack,$safeeval);
- $option_list =~ s/^\(//;
- $option_list =~ s/\)$//;
- $result .= ' \item[] Use the following options: \textbf{'.$option_list.'}. ';
}
return $result;
}
@@ -277,7 +273,7 @@ sub displayfoils {
my @falselist;
my $result;
my $name;
- $Apache::optionresponse::displayoptionintex=0;
+ my $displayoptionintex=0;
my @whichopt = &whichfoils($max);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
@@ -285,9 +281,16 @@ sub displayfoils {
foreach $name (@whichopt) {
if ($target eq 'web') {
$result.="
";
+ } elsif ($target eq 'tex') {
+ $result.='\vskip 0 mm ';
+ }
+ if ($target ne 'tex') {
+ $result .=$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ } else {
+ $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
- $result .=$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
my $temp=1;
@@ -309,19 +312,28 @@ sub displayfoils {
."\n".$Apache::response::foilgroup{$name.'.text'}."\n";
$temp++;
} else {
- if ($Apache::optionresponse::displayoptionintex == 0) {
- my $durtyoptionlist = $optionlist;
- $durtyoptionlist =~ s/