--- loncom/homework/optionresponse.pm 2011/09/13 21:42:58 1.177
+++ loncom/homework/optionresponse.pm 2011/09/30 16:47:08 1.180
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.177 2011/09/13 21:42:58 raeburn Exp $
+# $Id: optionresponse.pm,v 1.180 2011/09/30 16:47:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -155,13 +155,9 @@ ENDTABLE
splice(@options,$delopt-1,1);
$optchanged=1;
}
- if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+ if ($env{"form.$Apache::lonxml::curdepth.options"} ne '') {
my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
- if ($options[0]) {
- push(@options,$newopt);
- } else {
- $options[0]=$newopt;
- }
+ push(@options,$newopt);
$optchanged=1;
}
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
@@ -279,12 +275,14 @@ sub end_foilgroup {
}
$temp += $numrows;
} else {
+ $response=&Apache::response::getresponse($temp);
if ($response=~/\S/) {
$response = $opt[$response];
}
$temp ++;
}
} else {
+ $response=&Apache::response::getresponse($temp);
$temp ++;
}
if ( $response =~ /[^\s]/) {
@@ -912,9 +910,6 @@ sub end_foil {
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
$name=$Apache::lonxml::curdepth;
}
- if ($name eq "0") {
- &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.',''.$name.''));
- }
&Apache::lonxml::debug("Using a name of :$name:");
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",''.$name.''));