--- loncom/homework/optionresponse.pm 2003/03/26 18:42:29 1.69
+++ loncom/homework/optionresponse.pm 2003/04/02 18:40:37 1.73
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.69 2003/03/26 18:42:29 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.73 2003/04/02 18:40:37 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,8 +31,6 @@ package Apache::optionresponse;
use strict;
use Apache::response;
-my $flag_for_exam_printing = 1;
-
BEGIN {
&Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
}
@@ -318,8 +316,7 @@ sub displayfoils {
my $result;
my $name;
my $displayoptionintex=0;
- my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
- 'Q','R','S','T','U','V','W','X','Y','Z');
+ my @alphabet = ('A'..'Z');
my @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
@@ -385,16 +382,18 @@ sub displayfoils {
}
}
if ($target ne 'tex') {
- $optionlist='\n";
+ }
my $text=$Apache::response::foilgroup{$name.'.text'};
- if (!($text=~s||$optionlist|)) {
+ if (!($text=~s||$optionlist|) && $Apache::lonhomework::type ne 'exam') {
$text=$optionlist.$text;
}
$result.=$break.$text."\n";
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&webbubbles(\@opt,\@alphabet);
+ $result.=&webbubbles(\@opt,\@alphabet,$temp);
}
$temp++;
} else {
@@ -469,14 +468,15 @@ sub optionlist_correction {
sub webbubbles {
- my ($ropt,$ralphabet)=@_;
+ my ($ropt,$ralphabet,$temp)=@_;
my @opt=@$ropt;
my @alphabet=@$ralphabet;
my $result='';
my $number_of_bubbles = $#opt + 1;
$result.= '
';
return $result;
@@ -633,10 +633,10 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) {
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
$Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
} else {
- if ($target eq 'tex') {
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
} else {
$Apache::response::conceptgroup{"$name.text"} = $text;
@@ -646,10 +646,10 @@ sub end_foil {
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;
- if ($Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) {
+ if ($Apache::lonhomework::type eq 'exam') {
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
} else {
- if ($target eq 'tex') {
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
} else {
$Apache::response::foilgroup{"$name.text"} = $text;