--- loncom/homework/optionresponse.pm 2003/10/15 19:51:29 1.84.2.2
+++ loncom/homework/optionresponse.pm 2003/10/27 19:27:09 1.93
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.84.2.2 2003/10/15 19:51:29 albertel Exp $
+# $Id: optionresponse.pm,v 1.93 2003/10/27 19:27:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,8 +25,6 @@
#
# http://www.lon-capa.org/
#
-# 2/21 Guy
-# 01/18 Alex
package Apache::optionresponse;
use strict;
use Apache::response;
@@ -63,7 +61,7 @@ sub start_optionresponse {
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('optionresponse');
} elsif ($target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
@@ -166,17 +164,10 @@ sub end_foilgroup {
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
} elsif ( $target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
- if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
- push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
- $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
- $Apache::response::foilgroup{"$name.value"};
- $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
- $Apache::response::foilgroup{"$name.text"};
- }
- push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
- push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
+ my @shown = &whichfoils($max,$randomize);
+ &Apache::response::analyze_store_foilgroup(\@shown,['text','value']);
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($max,$randomize);
@@ -302,7 +293,6 @@ 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') &&
&Apache::response::show_answer() ) {
my $temp=1;
@@ -441,7 +431,7 @@ sub optionlist_correction {
my $texoptionlist = shift;
if ($texoptionlist=~/