--- loncom/homework/optionresponse.pm 2003/10/27 19:27:09 1.93
+++ loncom/homework/optionresponse.pm 2004/01/06 20:37:29 1.97
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.93 2003/10/27 19:27:09 albertel Exp $
+# $Id: optionresponse.pm,v 1.97 2004/01/06 20:37:29 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -149,7 +149,8 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval);
my $name;
my @opt;
@@ -165,7 +166,8 @@ sub end_foilgroup {
$result.=&displayanswers($max,$randomize,@opt);
} elsif ( $target eq 'analyze') {
my @shown = &whichfoils($max,$randomize);
- &Apache::response::analyze_store_foilgroup(\@shown,['text','value']);
+ &Apache::response::analyze_store_foilgroup(\@shown,
+ ['text','value','location']);
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
@@ -182,8 +184,8 @@ sub end_foilgroup {
if ($ENV{'form.submitted'} eq 'scantron') {
$response = $opt[$response];
}
- $responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
+ $responsehash{$name}=$response;
my $value=$Apache::response::foilgroup{$name.'.value'};
&Apache::lonxml::debug("submitted a $response for $value
\n");
if ($value eq $response) {
@@ -316,6 +318,8 @@ sub displayfoils {
} else {
$text=$value.': '.$text;
}
+ } else {
+ $text=''.$text;
}
$result.=$text."\n";
} elsif ($target eq 'tex') {
@@ -365,6 +369,8 @@ sub displayfoils {
my $text=$Apache::response::foilgroup{$name.'.text'};
if (!($text=~s||$optionlist|) && $Apache::lonhomework::type ne 'exam') {
$text=$optionlist.$text;
+ } else {
+ $text=''.$text;
}
$result.=$break.$text."\n";
if ($Apache::lonhomework::type eq 'exam') {
@@ -439,7 +445,7 @@ sub optionlist_correction {
$texoptionlist =~ s/>/\$>\$/g;
$texoptionlist =~ s/\$<\$/g;
$texoptionlist =~ s/=/\$=\$/g;
- $texoptionlist =~ s/\^(\d+)/\$$1\$<\/m>/g;
+ $texoptionlist =~ s/\^(\d+)/\$^{$1}\$/g;
} else {
$texoptionlist =~ s/