--- loncom/lonnet/perl/lonnet.pm 2012/08/19 00:18:41 1.1185 +++ loncom/lonnet/perl/lonnet.pm 2012/08/23 14:17:48 1.1187 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1185 2012/08/19 00:18:41 raeburn Exp $ +# $Id: lonnet.pm,v 1.1187 2012/08/23 14:17:48 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -113,10 +113,10 @@ our @ISA = qw (Exporter); our @EXPORT = qw(%env); -# ---------------------------------------------------------------- Role Logging +# ------------------------------------ Logging (parameters, docs, slots, roles) { my $logid; - sub write_rolelog { + sub write_log { my ($context,$hash_name,$storehash,$delflag,$udom,$uname,$cdom,$cnum)=@_; if ($context eq 'course') { if (($cnum eq '') || ($cdom eq '')) { @@ -3555,8 +3555,8 @@ sub courserolelog { } else { $storehash{'section'} = $sec; } - &write_rolelog('course',$namespace,\%storehash,$delflag,$domain, - $username,$cdom,$cnum); + &write_log('course',$namespace,\%storehash,$delflag,$domain, + $username,$cdom,$cnum); if (($trole ne 'st') || ($sec ne '')) { &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum); } @@ -3576,8 +3576,8 @@ sub domainrolelog { end => $tend, context => $context, ); - &write_rolelog('domain',$namespace,\%storehash,$delflag,$domain, - $username,$cdom,$domconfiguser); + &write_log('domain',$namespace,\%storehash,$delflag,$domain, + $username,$cdom,$domconfiguser); } return; @@ -3595,8 +3595,8 @@ sub coauthorrolelog { end => $tend, context => $context, ); - &write_rolelog('author',$namespace,\%storehash,$delflag,$domain, - $username,$audom,$auname); + &write_log('author',$namespace,\%storehash,$delflag,$domain, + $username,$audom,$auname); } return; } @@ -3713,7 +3713,7 @@ sub get_my_roles { } my ($rolecode,$username,$domain,$section,$area); if ($context eq 'userroles') { - ($area,$rolecode) = split(/_/,$entry); + ($area,$rolecode) = ($entry =~ /^(.+)_([^_]+)$/); (undef,$domain,$username,$section) = split(/\//,$area); } else { ($role,$username,$domain,$section) = split(/\:/,$entry);