version 1.486, 2012/02/28 15:54:07
|
version 1.489, 2012/04/11 06:22:04
|
Line 3245 sub dump_profile_database {
|
Line 3245 sub dump_profile_database {
|
# that is matched against |
# that is matched against |
# database keywords to do |
# database keywords to do |
# selective dumps. |
# selective dumps. |
|
# range - optional range of entries |
|
# e.g., 10-20 would return the |
|
# 10th to 19th items, etc. |
|
# extra - optional ref to hash of |
|
# additional args. currently |
|
# skipcheck is only key used. |
# $client - Channel open on the client. |
# $client - Channel open on the client. |
# Returns: |
# Returns: |
# 1 - Continue processing. |
# 1 - Continue processing. |
Line 3279 sub dump_with_regexp {
|
Line 3285 sub dump_with_regexp {
|
if ($hashref) { |
if ($hashref) { |
my $qresult=''; |
my $qresult=''; |
my $count=0; |
my $count=0; |
|
# |
|
# When dump is for roles.db, determine if LON-CAPA version checking is needed. |
|
# Sessions on 2.10 and later will include skipcheck => 1 in extra args ref, |
|
# to indicate no version checking is needed (in this case, checking occurs |
|
# on the server hosting the user session, when constructing the roles/courses |
|
# screen). |
|
# |
if ($extra ne '') { |
if ($extra ne '') { |
$extra = &Apache::lonnet::thaw_unescape($extra); |
$extra = &Apache::lonnet::thaw_unescape($extra); |
$skipcheck = $extra->{'skipcheck'}; |
$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 dump is for roles.db from a pre-2.10 server, determine the LON-CAPA |
|
# version on the server which requested the data. For LON-CAPA 2.9, the |
|
# client session will have sent its LON-CAPA version when initiating the |
|
# connection. For LON-CAPA 2.8 and older, the version is retrieved from |
|
# the global %loncaparevs in lonnet.pm. |
|
# |
if (($namespace eq 'roles') && (!$skipcheck)) { |
if (($namespace eq 'roles') && (!$skipcheck)) { |
my $loncaparev = $clientversion; |
my $loncaparev = $clientversion; |
if ($loncaparev eq '') { |
if ($loncaparev eq '') { |
Line 3302 sub dump_with_regexp {
|
Line 3322 sub dump_with_regexp {
|
my $cdom = $1; |
my $cdom = $1; |
my $cnum = $2; |
my $cnum = $2; |
unless ($skipcheck) { |
unless ($skipcheck) { |
my ($role,$end,$start) = split(/\_/,$value); |
my ($role,$roleend,$rolestart) = split(/\_/,$value); |
if (!$end || $end > $now) { |
if (!$roleend || $roleend > $now) { |
|
# |
|
# For active course roles, check that requesting server is running a LON-CAPA |
|
# version which meets any version requirements for the course. Do not include |
|
# the role amongst the results returned if the requesting server's version is |
|
# too old. |
|
# |
|
# This determination is handled differently depending on whether the course's |
|
# homeserver is the current server, or whether it is a different server. |
|
# In both cases, the course's version requirement needs to be retrieved. |
|
# |
next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major, |
next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major, |
$minor,\%homecourses,\@ids)); |
$minor,\%homecourses,\@ids)); |
} |
} |
Line 3326 sub dump_with_regexp {
|
Line 3356 sub dump_with_regexp {
|
} |
} |
} |
} |
if (&untie_user_hash($hashref)) { |
if (&untie_user_hash($hashref)) { |
|
# |
|
# If dump is for roles.db from a pre-2.10 server, check if the LON-CAPA |
|
# version requirements for courses for which the current server is the home |
|
# server permit course roles to be usable on the client server hosting the |
|
# user's session. If so, include those role results in the data returned to |
|
# the client server. |
|
# |
if (($namespace eq 'roles') && (!$skipcheck)) { |
if (($namespace eq 'roles') && (!$skipcheck)) { |
if (keys(%homecourses) > 0) { |
if (keys(%homecourses) > 0) { |
$qresult .= &check_homecourses(\%homecourses,$udom,$regexp,$count, |
$qresult .= &check_homecourses(\%homecourses,$regexp,$count, |
$range,$start,$end,$major,$minor); |
$range,$start,$end,$major,$minor); |
} |
} |
} |
} |
Line 6717 sub is_author {
|
Line 6754 sub is_author {
|
|
|
# Author role should show up as a key /domain/_au |
# Author role should show up as a key /domain/_au |
|
|
my $key = "/$domain/_au"; |
|
my $value; |
my $value; |
if (defined($hashref)) { |
if ($hashref) { |
$value = $hashref->{$key}; |
|
} |
|
|
|
if(defined($value)) { |
my $key = "/$domain/_au"; |
&Debug("$user @ $domain is an author"); |
if (defined($hashref)) { |
|
$value = $hashref->{$key}; |
|
if(!untie_user_hash($hashref)) { |
|
return 'error: ' . ($!+0)." untie (GDBM) Failed"; |
|
} |
|
} |
|
|
|
if(defined($value)) { |
|
&Debug("$user @ $domain is an author"); |
|
} |
|
} else { |
|
return 'error: '.($!+0)." tie (GDBM) Failed"; |
} |
} |
|
|
return defined($value); |
return defined($value); |
Line 7429 sub get_usersession_config {
|
Line 7474 sub get_usersession_config {
|
return; |
return; |
} |
} |
|
|
|
# |
|
# releasereqd_check() will determine if a LON-CAPA version (defined in the |
|
# $major,$minor args passed) is not too old to allow use of a role in a |
|
# course ($cnum,$cdom args passed), if at least one of the following applies: |
|
# (a) the course is a Community, (b) the course's home server is *not* the |
|
# current server, or (c) cached course information is not stale. |
|
# |
|
# For the case where none of these apply, the course is added to the |
|
# $homecourse hash ref (keys = courseIDs, values = array of a hash of roles). |
|
# The $homecourse hash ref is for courses for which the current server is the |
|
# home server. LON-CAPA version requirements are checked elsewhere for the |
|
# items in $homecourse. |
|
# |
|
|
sub releasereqd_check { |
sub releasereqd_check { |
my ($cnum,$cdom,$key,$value,$major,$minor,$homecourses,$ids) = @_; |
my ($cnum,$cdom,$key,$value,$major,$minor,$homecourses,$ids) = @_; |
my $home = &Apache::lonnet::homeserver($cnum,$cdom); |
my $home = &Apache::lonnet::homeserver($cnum,$cdom); |
Line 7458 sub releasereqd_check {
|
Line 7517 sub releasereqd_check {
|
if (ref($ids) eq 'ARRAY') { |
if (ref($ids) eq 'ARRAY') { |
if (grep(/^\Q$home\E$/,@{$ids})) { |
if (grep(/^\Q$home\E$/,@{$ids})) { |
if (ref($homecourses) eq 'HASH') { |
if (ref($homecourses) eq 'HASH') { |
if (ref($homecourses->{$hashid}) eq 'ARRAY') { |
if (ref($homecourses->{$cdom}) eq 'HASH') { |
push(@{$homecourses->{$hashid}},{$key=>$value}); |
if (ref($homecourses->{$cdom}{$cnum}) eq 'HASH') { |
|
if (ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY') { |
|
push(@{$homecourses->{$cdom}{$cnum}},{$key=>$value}); |
|
} else { |
|
$homecourses->{$cdom}{$cnum} = [{$key=>$value}]; |
|
} |
|
} else { |
|
$homecourses->{$cdom}{$cnum} = [{$key=>$value}]; |
|
} |
} else { |
} else { |
$homecourses->{$hashid} = [{$key=>$value}]; |
$homecourses->{$cdom}{$cnum} = [{$key=>$value}]; |
} |
} |
} |
} |
return; |
return; |
Line 7480 sub releasereqd_check {
|
Line 7547 sub releasereqd_check {
|
return 1; |
return 1; |
} |
} |
|
|
|
# |
|
# get_courseinfo_hash() is used to retrieve course information from the db |
|
# file: nohist_courseids.db for a course for which the current server is *not* |
|
# the home server. |
|
# |
|
# A hash of a hash will be retrieved. The outer hash contains a single key -- |
|
# courseID -- for the course for which the data are being requested. |
|
# The contents of the inner hash, for that single item in the outer hash |
|
# are returned (and cached in memcache for 10 minutes). |
|
# |
|
|
sub get_courseinfo_hash { |
sub get_courseinfo_hash { |
my ($cnum,$cdom,$home) = @_; |
my ($cnum,$cdom,$home) = @_; |
my %info; |
my %info; |
Line 7505 sub get_courseinfo_hash {
|
Line 7583 sub get_courseinfo_hash {
|
return; |
return; |
} |
} |
|
|
|
# |
|
# check_homecourses() will retrieve course information for those courses which |
|
# are keys of the $homecourses hash ref (first arg). The nohist_courseids.db |
|
# GDBM file is tied and course information for each course retrieved. Last |
|
# visit (lasttime key) is also retrieved for each, and cached values updated |
|
# for any courses last visited less than 24 hours ago. Cached values are also |
|
# updated for any courses included in the $homecourses hash ref. |
|
# |
|
# The reason for the 24 hours constraint is that the cron entry in |
|
# /etc/cron.d/loncapa for /home/httpd/perl/refresh_courseids_db.pl causes |
|
# cached course information to be updated nightly for courses with activity |
|
# within the past 24 hours. |
|
# |
|
# Role information for the user (included in a ref to an array of hashes as the |
|
# value for each key in $homecourses) is appended to the result returned by the |
|
# routine, which will in turn be appended to the string returned to the client |
|
# hosting the user's session. |
|
# |
|
|
sub check_homecourses { |
sub check_homecourses { |
my ($homecourses,$udom,$regexp,$count,$range,$start,$end,$major,$minor) = @_; |
my ($homecourses,$regexp,$count,$range,$start,$end,$major,$minor) = @_; |
my ($result,%addtocache); |
my ($result,%addtocache); |
my $yesterday = time - 24*3600; |
my $yesterday = time - 24*3600; |
if (ref($homecourses) eq 'HASH') { |
if (ref($homecourses) eq 'HASH') { |
my (%okcourses,%courseinfo,%recent); |
my (%okcourses,%courseinfo,%recent); |
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT()); |
foreach my $domain (keys(%{$homecourses})) { |
if ($hashref) { |
my $hashref = |
while (my ($key,$value) = each(%$hashref)) { |
&tie_domain_hash($domain, "nohist_courseids", &GDBM_WRCREAT()); |
my $unesc_key = &unescape($key); |
if (ref($hashref) eq 'HASH') { |
if ($unesc_key =~ /^lasttime:(\w+)$/) { |
while (my ($key,$value) = each(%$hashref)) { |
my $cid = $1; |
my $unesc_key = &unescape($key); |
$cid =~ s/_/:/; |
if ($unesc_key =~ /^lasttime:(\w+)$/) { |
if ($value > $yesterday ) { |
my $cid = $1; |
$recent{$cid} = 1; |
$cid =~ s/_/:/; |
|
if ($value > $yesterday ) { |
|
$recent{$cid} = 1; |
|
} |
|
next; |
} |
} |
next; |
my $items = &Apache::lonnet::thaw_unescape($value); |
} |
if (ref($items) eq 'HASH') { |
my $items = &Apache::lonnet::thaw_unescape($value); |
my ($cdom,$cnum) = split(/_/,$unesc_key); |
if (ref($items) eq 'HASH') { |
my $hashid = $cdom.':'.$cnum; |
my $hashid = $unesc_key; |
$courseinfo{$hashid} = $items; |
$hashid =~ s/_/:/; |
if (ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY') { |
$courseinfo{$hashid} = $items; |
my ($reqdmajor,$reqdminor) = split(/\./,$items->{'releaserequired'}); |
if (ref($homecourses->{$hashid}) eq 'ARRAY') { |
if (&useable_role($reqdmajor,$reqdminor,$major,$minor)) { |
my ($reqdmajor,$reqdminor) = split(/\./,$items->{'releaserequired'}); |
$okcourses{$hashid} = 1; |
if (&useable_role($reqdmajor,$reqdminor,$major,$minor)) { |
} |
$okcourses{$hashid} = 1; |
|
} |
} |
} |
} |
} |
} |
|
unless (&untie_domain_hash($hashref)) { |
|
&logthis("Failed to untie tied hash for nohist_courseids.db for $domain"); |
|
} |
|
} else { |
|
&logthis("Failed to tie hash for nohist_courseids.db for $domain"); |
} |
} |
unless (&untie_domain_hash($hashref)) { |
|
&logthis('Failed to untie tied hash for nohist_courseids.db'); |
|
} |
|
} else { |
|
&logthis('Failed to tie hash for nohist_courseids.db'); |
|
return; |
|
} |
} |
foreach my $hashid (keys(%recent)) { |
foreach my $hashid (keys(%recent)) { |
my ($result,$cached)=&Apache::lonnet::is_cached_new('courseinfo',$hashid); |
my ($result,$cached)=&Apache::lonnet::is_cached_new('courseinfo',$hashid); |
Line 7549 sub check_homecourses {
|
Line 7648 sub check_homecourses {
|
&Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); |
&Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); |
} |
} |
} |
} |
foreach my $hashid (keys(%{$homecourses})) { |
foreach my $cdom (keys(%{$homecourses})) { |
next if ($recent{$hashid}); |
if (ref($homecourses->{$cdom}) eq 'HASH') { |
&Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); |
foreach my $cnum (keys(%{$homecourses->{$cdom}})) { |
|
my $hashid = $cdom.':'.$cnum; |
|
next if ($recent{$hashid}); |
|
&Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); |
|
} |
|
} |
} |
} |
foreach my $hashid (keys(%okcourses)) { |
foreach my $hashid (keys(%okcourses)) { |
if (ref($homecourses->{$hashid}) eq 'ARRAY') { |
my ($cdom,$cnum) = split(/:/,$hashid); |
foreach my $role (@{$homecourses->{$hashid}}) { |
if ((ref($homecourses->{$cdom}) eq 'HASH') && |
|
(ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY')) { |
|
foreach my $role (@{$homecourses->{$cdom}{$cnum}}) { |
if (ref($role) eq 'HASH') { |
if (ref($role) eq 'HASH') { |
while (my ($key,$value) = each(%{$role})) { |
while (my ($key,$value) = each(%{$role})) { |
if ($regexp eq '.') { |
if ($regexp eq '.') { |
Line 7581 sub check_homecourses {
|
Line 7687 sub check_homecourses {
|
return $result; |
return $result; |
} |
} |
|
|
|
# |
|
# useable_role() will compare the LON-CAPA version required by a course with |
|
# the version available on the client server. If the client server's version |
|
# is compatible, 1 will be returned. |
|
# |
|
|
sub useable_role { |
sub useable_role { |
my ($reqdmajor,$reqdminor,$major,$minor) = @_; |
my ($reqdmajor,$reqdminor,$major,$minor) = @_; |
if ($reqdmajor ne '' && $reqdminor ne '') { |
if ($reqdmajor ne '' && $reqdminor ne '') { |