version 1.528, 2015/02/22 01:34:48
|
version 1.530, 2015/02/23 10:40:01
|
Line 899 sub helpmenu_datastructure {
|
Line 899 sub helpmenu_datastructure {
|
sub convert_for_js { |
sub convert_for_js { |
my $return = shift; |
my $return = shift; |
$return =~ s|script|ESCAPEDSCRIPT|g; |
$return =~ s|script|ESCAPEDSCRIPT|g; |
|
$return =~ s|\\|\\\\|g; |
$return =~ s|\n|\\r\\n|g; |
$return =~ s|\n|\\r\\n|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
Line 1677 sub start_problem {
|
Line 1678 sub start_problem {
|
my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist); |
my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist); |
if (($target eq 'grade') && &Apache::response::submitted()) { |
if (($target eq 'grade') && &Apache::response::submitted()) { |
if ($Apache::lonhomework::type eq 'randomizetry') { |
if ($Apache::lonhomework::type eq 'randomizetry') { |
$Apache::lonhomework::results{'resource.0.rawrndseed'}=$rndseed; |
$Apache::lonhomework::results{'resource.0.rndseed'}=$rndseed; |
} else { |
} else { |
my @parts; |
my @parts; |
if (ref($probpartlist) eq 'ARRAY') { |
if (ref($probpartlist) eq 'ARRAY') { |
@parts = @{$probpartlist}; |
@parts = @{$probpartlist}; |
} |
} |
unless (@parts) { |
unless (@parts) { |
$Apache::lonhomework::results{'resource.0.rawrndseed'}=$Apache::lonhomework::rawrndseed; |
$Apache::lonhomework::results{'resource.0.rndseed'}=$Apache::lonhomework::rawrndseed; |
} |
} |
} |
} |
} |
} |
Line 2747 sub start_part {
|
Line 2748 sub start_part {
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
if ($Apache::lonhomework::type eq 'randomizetry') { |
my $rndseed=&setup_rndseed($safeeval,$target); |
my $rndseed=&setup_rndseed($safeeval,$target); |
if (($target eq 'grade') && &Apache::response::submitted()) { |
if (($target eq 'grade') && &Apache::response::submitted()) { |
$Apache::lonhomework::results{"resource.$id.rawrndseed"}=$rndseed; |
$Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed; |
} |
} |
} elsif (($target eq 'grade') && &Apache::response::submitted()) { |
} elsif (($target eq 'grade') && &Apache::response::submitted()) { |
$Apache::lonhomework::results{"resource.$id.rawrndseed"}=$Apache::lonhomework::rawrndseed; |
$Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed; |
} |
} |
my $in_order_show=&ordered_show_check(); |
my $in_order_show=&ordered_show_check(); |
my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; |
my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; |