--- loncom/homework/optionresponse.pm 2003/07/25 19:29:15 1.81
+++ loncom/homework/optionresponse.pm 2003/10/13 19:25:30 1.89
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.81 2003/07/25 19:29:15 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.89 2003/10/13 19:25:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -302,10 +302,8 @@ sub displayfoils {
my $id=$Apache::inputtags::response[-1];
my $break;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
- my $status=$Apache::inputtags::status[-1];
- if (
- ($target ne 'tex') &&
- (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
+ if ( ($target ne 'tex') &&
+ &Apache::response::show_answer() ) {
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -328,7 +326,8 @@ sub displayfoils {
$result.=$text."\n";
} elsif ($target eq 'tex') {
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
- $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
+ if ($max>1) {$result .='\item ';}
+ $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
if ($Apache::lonhomework::type eq 'exam') {
@@ -436,8 +435,8 @@ sub displayfoils {
sub optionlist_correction {
my $texoptionlist = shift;
- if ($texoptionlist=~/