version 1.455, 2010/08/30 13:24:20
|
version 1.456, 2010/09/26 01:50:28
|
Line 3171 sub dump_with_regexp {
|
Line 3171 sub dump_with_regexp {
|
} |
} |
my $hashref = &tie_user_hash($udom, $uname, $namespace, |
my $hashref = &tie_user_hash($udom, $uname, $namespace, |
&GDBM_READER()); |
&GDBM_READER()); |
my $clientcheckrole; |
my $skipcheck; |
if ($hashref) { |
if ($hashref) { |
my $qresult=''; |
my $qresult=''; |
my $count=0; |
my $count=0; |
if ($extra ne '') { |
if ($extra ne '') { |
$extra = &Apache::lonnet::thaw_unescape($extra); |
$extra = &Apache::lonnet::thaw_unescape($extra); |
$clientcheckrole = $extra->{'clientcheckrole'}; |
$skipcheck = $extra->{'skipcheck'}; |
} |
} |
my @ids = &Apache::lonnet::current_machine_ids(); |
my @ids = &Apache::lonnet::current_machine_ids(); |
my (%homecourses,$major,$minor,$now); |
my (%homecourses,$major,$minor,$now); |
if (($namespace eq 'roles') && (!$clientcheckrole)) { |
if (($namespace eq 'roles') && (!$skipcheck)) { |
my $loncaparev = $clientversion; |
my $loncaparev = $clientversion; |
if ($loncaparev eq '') { |
if ($loncaparev eq '') { |
$loncaparev = $Apache::lonnet::loncaparevs{$clientname}; |
$loncaparev = $Apache::lonnet::loncaparevs{$clientname}; |
Line 3197 sub dump_with_regexp {
|
Line 3197 sub dump_with_regexp {
|
if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_courseid)(/?[^_]*)_(cc|co|in|ta|ep|ad|st|cr)$}) { |
if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_courseid)(/?[^_]*)_(cc|co|in|ta|ep|ad|st|cr)$}) { |
my $cdom = $1; |
my $cdom = $1; |
my $cnum = $2; |
my $cnum = $2; |
unless ($clientcheckrole) { |
unless ($skipcheck) { |
next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major,$minor, |
next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major,$minor, |
$now,\%homecourses,\@ids)); |
$now,\%homecourses,\@ids)); |
} |
} |
Line 3219 sub dump_with_regexp {
|
Line 3219 sub dump_with_regexp {
|
} |
} |
} |
} |
if (&untie_user_hash($hashref)) { |
if (&untie_user_hash($hashref)) { |
if (($namespace eq 'roles') && (!$clientcheckrole)) { |
if (($namespace eq 'roles') && (!$skipcheck)) { |
if (keys(%homecourses) > 0) { |
if (keys(%homecourses) > 0) { |
$qresult .= &check_homecourses(\%homecourses,$udom,$regexp,$count, |
$qresult .= &check_homecourses(\%homecourses,$udom,$regexp,$count, |
$range,$start,$end,$major,$minor); |
$range,$start,$end,$major,$minor); |