version 1.549, 2014/07/27 11:20:13
|
version 1.552, 2015/02/22 18:40:18
|
Line 229 sub xmlend {
|
Line 229 sub xmlend {
|
} |
} |
|
|
sub printalltags { |
sub printalltags { |
my $temp; |
foreach my $temp (sort(keys(%Apache::lonxml::alltags))) { |
foreach $temp (sort keys %Apache::lonxml::alltags) { |
&Apache::lonxml::debug("$temp -- ". |
&Apache::lonxml::debug("$temp -- ". |
join(',',@{ $Apache::lonxml::alltags{$temp} })); |
join(',',@{ $Apache::lonxml::alltags{$temp} })); |
} |
} |
|
} |
} |
|
|
sub xmlparse { |
sub xmlparse { |
Line 814 sub init_safespace {
|
Line 813 sub init_safespace {
|
$safeeval->permit("require"); |
$safeeval->permit("require"); |
$safeinit .= ';$external::target="'.$target.'";'; |
$safeinit .= ';$external::target="'.$target.'";'; |
&Apache::run::run($safeinit,$safeeval); |
&Apache::run::run($safeinit,$safeeval); |
&initialize_rndseed($safeeval); |
my $rawrndseed = &initialize_rndseed($safeeval); |
|
if ($target eq 'grade') { |
|
$Apache::lonhomework::rawrndseed = $rawrndseed; |
|
} |
} |
} |
|
|
sub clean_safespace { |
sub clean_safespace { |
Line 853 sub initialize_rndseed {
|
Line 855 sub initialize_rndseed {
|
my $safeinit = '$external::randomseed="'.$rndseed.'";'; |
my $safeinit = '$external::randomseed="'.$rndseed.'";'; |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run($safeinit,$safeeval); |
&Apache::run::run($safeinit,$safeeval); |
|
return $rndseed; |
} |
} |
|
|
sub default_homework_load { |
sub default_homework_load { |
Line 1327 sub extlink {
|
Line 1330 sub extlink {
|
if (!$exact) { |
if (!$exact) { |
$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res); |
$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res); |
} |
} |
push(@Apache::lonxml::extlinks,$res) |
push(@Apache::lonxml::extlinks,$res); |
} |
} |
|
|
sub writeallows { |
sub writeallows { |
Line 2054 sub error {
|
Line 2057 sub error {
|
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
my $baseurl = &Apache::lonnet::clutter($declutter); |
my $baseurl = &Apache::lonnet::clutter($declutter); |
my @userlist; |
my @userlist; |
foreach (keys %users) { |
foreach (keys(%users)) { |
my ($user,$domain) = split(/:/, $_); |
my ($user,$domain) = split(/:/, $_); |
push(@userlist,"$user:$domain"); |
push(@userlist,"$user:$domain"); |
my $key=$declutter.'_'.$user.'_'.$domain; |
my $key=$declutter.'_'.$user.'_'.$domain; |