version 1.147, 2010/12/19 04:24:29
|
version 1.150, 2011/08/26 22:40:17
|
Line 336 sub displayallfoils {
|
Line 336 sub displayallfoils {
|
my $i =0; |
my $i =0; |
my $id=$Apache::inputtags::response['-1']; |
my $id=$Apache::inputtags::response['-1']; |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $lastresponse; |
|
my ($lastresponse,$newvariation,$showanswer); |
my ($lastresponse,$newvariation,$showanswer); |
if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || |
if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || |
($Apache::lonhomework::type eq 'randomizetry')) && |
($Apache::lonhomework::type eq 'randomizetry')) && |
Line 556 sub whichfoils {
|
Line 555 sub whichfoils {
|
$dosplice=0; |
$dosplice=0; |
} else { |
} else { |
if ($topcount>0 || $bottomcount>0) { |
if ($topcount>0 || $bottomcount>0) { |
$answer = int(&Math::Random::random_uniform() * ($#whichfalse+1)) |
my $inc = 1; |
+ $topcount; |
if (($bottomcount > 0) && ($Apache::lonhomework::type ne 'exam')) { |
|
$inc = 2; |
|
} |
|
$answer=int(&Math::Random::random_uniform() * ($#whichfalse+$inc)) |
|
+ $topcount; |
} |
} |
} |
} |
&Apache::lonxml::debug("Answer now wants $answer"); |
&Apache::lonxml::debug("Answer now wants $answer"); |
Line 816 sub end_foil {
|
Line 819 sub end_foil {
|
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); |
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); |
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
|
if ($name eq "0") { |
|
&Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.','<b><tt>'.$name.'</tt></b>')); |
|
} |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>')); |
&Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.','<b><tt>'.$name.'</tt></b>')); |
} |
} |