version 1.417, 2009/07/25 15:25:10
|
version 1.418, 2009/07/29 22:32:39
|
Line 3674 sub put_course_id_hash_handler {
|
Line 3674 sub put_course_id_hash_handler {
|
# will be returned. Pre-2.2.0 legacy entries from |
# will be returned. Pre-2.2.0 legacy entries from |
# nohist_courseiddump will only contain usernames. |
# nohist_courseiddump will only contain usernames. |
# type - optional parameter for selection |
# type - optional parameter for selection |
# regexp_ok - if true, allow the supplied institutional code |
# regexp_ok - if 1 or -1 allow the supplied institutional code |
# filter to behave as a regular expression. |
# filter to behave as a regular expression: |
|
# 1 will not exclude the course if the instcode matches the RE |
|
# -1 will exclude the course if the instcode matches the RE |
# rtn_as_hash - whether to return the information available for |
# rtn_as_hash - whether to return the information available for |
# each matched item as a frozen hash of all |
# each matched item as a frozen hash of all |
# key, value pairs in the item's hash, or as a |
# key, value pairs in the item's hash, or as a |
Line 3829 sub dump_course_id_handler {
|
Line 3831 sub dump_course_id_handler {
|
if (!$is_hash) { |
if (!$is_hash) { |
$unesc_val{'inst_code'} = &unescape($val{'inst_code'}); |
$unesc_val{'inst_code'} = &unescape($val{'inst_code'}); |
} |
} |
if ($regexp_ok) { |
if ($regexp_ok == 1) { |
if (eval{$unesc_val{'inst_code'} !~ /$instcodefilter/}) { |
if (eval{$unesc_val{'inst_code'} !~ /$instcodefilter/}) { |
$match = 0; |
$match = 0; |
} |
} |
|
} elsif ($regexp_ok == -1) { |
|
if (eval{$unesc_val{'inst_code'} =~ /$instcodefilter/}) { |
|
$match = 0; |
|
} |
} else { |
} else { |
if (eval{$unesc_val{'inst_code'} !~ /\Q$instcodefilter\E/i}) { |
if (eval{$unesc_val{'inst_code'} !~ /\Q$instcodefilter\E/i}) { |
$match = 0; |
$match = 0; |