[LON-CAPA-cvs] cvs: loncom /interface londocs.pm lonparmset.pm slotrequest.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Mon Aug 27 14:33:25 2012 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm lonparmset.pm londocs.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Add the new first arg ($context) to places where &lonnet::write_log() is
    called.  
  - Reverse order of username and domain args in write_log() and
    callers in lonnet.pm for consistency with original calls in londocs.pm,
    lonparmset.pm, slotrequest.pm.
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.115 loncom/interface/slotrequest.pm:1.116
--- loncom/interface/slotrequest.pm:1.115	Thu Aug 23 14:17:13 2012
+++ loncom/interface/slotrequest.pm	Mon Aug 27 14:33:15 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.115 2012/08/23 14:17:13 raeburn Exp $
+# $Id: slotrequest.pm,v 1.116 2012/08/27 14:33:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,10 +339,10 @@
                        context => $env{'form.context'},
                     );
 
-    &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+    &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
                                '',$env{'user.name'},$env{'user.domain'},
                                $cnum,$cdom);
-    &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+    &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
                                1,$env{'user.name'},$env{'user.domain'},
                                $env{'user.name'},$env{'user.domain'});
 
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.524 loncom/interface/lonparmset.pm:1.525
--- loncom/interface/lonparmset.pm:1.524	Thu Aug 23 14:17:12 2012
+++ loncom/interface/lonparmset.pm	Mon Aug 27 14:33:15 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.524 2012/08/23 14:17:12 raeburn Exp $
+# $Id: lonparmset.pm,v 1.525 2012/08/27 14:33:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -661,7 +661,7 @@
 }
 
 sub log_parmset {
-    return &Apache::lonnet::write_log('parameterlog', at _);
+    return &Apache::lonnet::write_log('course','parameterlog', at _);
 }
 
 sub storeparm_by_symb_inner {
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.493 loncom/interface/londocs.pm:1.494
--- loncom/interface/londocs.pm:1.493	Thu Aug 23 14:17:13 2012
+++ loncom/interface/londocs.pm	Mon Aug 27 14:33:15 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.493 2012/08/23 14:17:13 raeburn Exp $
+# $Id: londocs.pm,v 1.494 2012/08/27 14:33:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -369,7 +369,7 @@
 }
 
 sub log_docs {
-    return &Apache::lonnet::write_log('docslog', at _);
+    return &Apache::lonnet::write_log('course','docslog', at _);
 }
 
 {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1187 loncom/lonnet/perl/lonnet.pm:1.1188
--- loncom/lonnet/perl/lonnet.pm:1.1187	Thu Aug 23 14:17:48 2012
+++ loncom/lonnet/perl/lonnet.pm	Mon Aug 27 14:33:24 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1187 2012/08/23 14:17:48 raeburn Exp $
+# $Id: lonnet.pm,v 1.1188 2012/08/27 14:33:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,7 +117,7 @@
 {
     my $logid;
     sub write_log {
-	my ($context,$hash_name,$storehash,$delflag,$udom,$uname,$cdom,$cnum)=@_;
+	my ($context,$hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
         if ($context eq 'course') {
             if (($cnum eq '') || ($cdom eq '')) {
                 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -3555,8 +3555,8 @@
         } else {
             $storehash{'section'} = $sec;
         }
-        &write_log('course',$namespace,\%storehash,$delflag,$domain,
-                   $username,$cdom,$cnum);
+        &write_log('course',$namespace,\%storehash,$delflag,$username,
+                   $domain,$cnum,$cdom);
         if (($trole ne 'st') || ($sec ne '')) {
             &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
         }
@@ -3576,8 +3576,8 @@
                            end     => $tend,
                            context => $context,
                         );
-        &write_log('domain',$namespace,\%storehash,$delflag,$domain,
-                   $username,$cdom,$domconfiguser);
+        &write_log('domain',$namespace,\%storehash,$delflag,$username,
+                   $domain,$domconfiguser,$cdom);
     }
     return;
 
@@ -3595,8 +3595,8 @@
                            end     => $tend,
                            context => $context,
                         );
-        &write_log('author',$namespace,\%storehash,$delflag,$domain,
-                   $username,$audom,$auname);
+        &write_log('author',$namespace,\%storehash,$delflag,$username,
+                   $domain,$auname,$audom);
     }
     return;
 }