version 1.3, 2015/04/28 13:20:41
|
version 1.4, 2015/09/13 21:48:05
|
Line 302 sub init_global_hashes {
|
Line 302 sub init_global_hashes {
|
} |
} |
} |
} |
($Apache::lonrelrequtils::anonsurvey{major},$Apache::lonrelrequtils::anonsurvey{minor}) = |
($Apache::lonrelrequtils::anonsurvey{major},$Apache::lonrelrequtils::anonsurvey{minor}) = |
split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'}); |
split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey:'}); |
($Apache::lonrelrequtils::randomizetry{major},$Apache::lonrelrequtils::randomizetry{minor}) = |
($Apache::lonrelrequtils::randomizetry{major},$Apache::lonrelrequtils::randomizetry{minor}) = |
split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'}); |
split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry:'}); |
return; |
return; |
} |
} |
|
|
Line 371 sub parameter_constraints {
|
Line 371 sub parameter_constraints {
|
} |
} |
foreach my $item (keys(%Apache::lonrelrequtils::checkparmsmatch)) { |
foreach my $item (keys(%Apache::lonrelrequtils::checkparmsmatch)) { |
if ($key =~ /(\Q$item\E)$/) { |
if ($key =~ /(\Q$item\E)$/) { |
if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') { |
if (ref($Apache::lonrelrequtils::checkparmsmatch{$item}) eq 'ARRAY') { |
my $value = $resourcedata->{$key}; |
my $value = $resourcedata->{$key}; |
foreach my $entry (@{$Apache::lonrelrequtils::checkparms{$item}}) { |
foreach my $entry (@{$Apache::lonrelrequtils::checkparmsmatch{$item}}) { |
my $regexp; |
my $regexp; |
if (($item eq 'lenient') && ($entry eq 'weighted')) { |
if (($item eq 'lenient') && ($entry eq 'weighted')) { |
$regexp = '^[\-\.\d]+,[\-\.\d]+,[\-\.\d]+,[\-\.\d]+$'; |
$regexp = '^[\-\.\d]+,[\-\.\d]+,[\-\.\d]+,[\-\.\d]+$'; |
} elsif (($item eq 'acc') && ($entry eq '_denyfrom_')) { |
} elsif (($item eq 'acc') && ($entry eq '_denyfrom_')) { |
$regexp = '\!'; |
$regexp = '\!'; |
|
} elsif (($item eq 'interval') && ($entry eq 'done')) { |
|
$regexp = '^\d+_done$'; |
} |
} |
if ($regexp ne '') { |
if ($regexp ne '') { |
if ($value =~ /$regexp/) { |
if ($value =~ /$regexp/) { |
Line 415 sub commblock_constraints {
|
Line 417 sub commblock_constraints {
|
if (keys(%comm_blocks) > 0) { |
if (keys(%comm_blocks) > 0) { |
foreach my $block (keys(%comm_blocks)) { |
foreach my $block (keys(%comm_blocks)) { |
if ($block =~ /^firstaccess____(.+)$/) { |
if ($block =~ /^firstaccess____(.+)$/) { |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:timer'}); |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:timer:'}); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
last; |
last; |
} elsif ($block =~ /^(\d+)____(\d+)$/) { |
} elsif ($block =~ /^(\d+)____(\d+)$/) { |
Line 426 sub commblock_constraints {
|
Line 428 sub commblock_constraints {
|
if (ref($comm_blocks{$block}{'blocks'}) eq 'HASH') { |
if (ref($comm_blocks{$block}{'blocks'}) eq 'HASH') { |
if (ref($comm_blocks{$block}{'blocks'}{'docs'}) eq 'HASH') { |
if (ref($comm_blocks{$block}{'blocks'}{'docs'}) eq 'HASH') { |
if (keys(%{$comm_blocks{$block}{'blocks'}{'docs'}}) > 0) { |
if (keys(%{$comm_blocks{$block}{'blocks'}{'docs'}}) > 0) { |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:docs'}); |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:docs:'}); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
last; |
last; |
} |
} |
} |
} |
if ($comm_blocks{$block}{'blocks'}{'printout'} eq 'on') { |
if ($comm_blocks{$block}{'blocks'}{'printout'} eq 'on') { |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:printout'}); |
my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:printout:'}); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); |
last; |
last; |
} |
} |