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

raeburn raeburn at source.lon-capa.org
Thu Aug 23 10:17:48 EDT 2012


raeburn		Thu Aug 23 14:17:48 2012 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm slotrequest.pm londocs.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Subroutine name change in lonnet.pm. Update places where called.
    - old name: instructor_log
    - temporary name (lonnet.pm rev. 1.1184): write_rolelog
    - new name: write_log
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.523 loncom/interface/lonparmset.pm:1.524
--- loncom/interface/lonparmset.pm:1.523	Wed May  9 19:46:30 2012
+++ loncom/interface/lonparmset.pm	Thu Aug 23 14:17:12 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.523 2012/05/09 19:46:30 raeburn Exp $
+# $Id: lonparmset.pm,v 1.524 2012/08/23 14:17:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -661,7 +661,7 @@
 }
 
 sub log_parmset {
-    return &Apache::lonnet::instructor_log('parameterlog', at _);
+    return &Apache::lonnet::write_log('parameterlog', at _);
 }
 
 sub storeparm_by_symb_inner {
@@ -4598,11 +4598,11 @@
                           action  => 'reserve',
                           context => 'parameter',
                         );
-        &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                        '',$uname,$udom,$cnum,$cdom);
+        &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+                                   '',$uname,$udom,$cnum,$cdom);
 
-        &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                        '',$uname,$udom,$uname,$udom);
+        &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                   '',$uname,$udom,$uname,$udom);
     }
     return $success;
 }
@@ -4632,10 +4632,10 @@
                                   action  => 'release',
                                   context => 'parameter',
                                 );
-                &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                                1,$uname,$udom,$cnum,$cdom);
-                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                                1,$uname,$udom,$uname,$udom);
+                &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+                                           1,$uname,$udom,$cnum,$cdom);
+                &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                           1,$uname,$udom,$uname,$udom);
             }
         }
     }
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.114 loncom/interface/slotrequest.pm:1.115
--- loncom/interface/slotrequest.pm:1.114	Wed Aug  1 20:26:43 2012
+++ loncom/interface/slotrequest.pm	Thu Aug 23 14:17:13 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.114 2012/08/01 20:26:43 raeburn Exp $
+# $Id: slotrequest.pm,v 1.115 2012/08/23 14:17:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,12 +339,12 @@
                        context => $env{'form.context'},
                     );
 
-    &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                    '',$env{'user.name'},$env{'user.domain'},
-                                    $cnum,$cdom);
-    &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                    1,$env{'user.name'},$env{'user.domain'},
-                                    $env{'user.name'},$env{'user.domain'});
+    &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+                               '',$env{'user.name'},$env{'user.domain'},
+                               $cnum,$cdom);
+    &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                               1,$env{'user.name'},$env{'user.domain'},
+                               $env{'user.name'},$env{'user.domain'});
 
     return;
 }
@@ -538,10 +538,10 @@
                                action  => 'release',
                                context => $env{'form.context'},
                         );
-            &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                            1,$uname,$udom,$cnum,$cdom);
-            &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                            1,$uname,$udom,$uname,$udom);
+            &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+                                       1,$uname,$udom,$cnum,$cdom);
+            &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                       1,$uname,$udom,$uname,$udom);
 	}
     }
 
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.492 loncom/interface/londocs.pm:1.493
--- loncom/interface/londocs.pm:1.492	Sun Jul 22 04:01:24 2012
+++ loncom/interface/londocs.pm	Thu Aug 23 14:17:13 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.492 2012/07/22 04:01:24 raeburn Exp $
+# $Id: londocs.pm,v 1.493 2012/08/23 14:17:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -369,7 +369,7 @@
 }
 
 sub log_docs {
-    return &Apache::lonnet::instructor_log('docslog', at _);
+    return &Apache::lonnet::write_log('docslog', at _);
 }
 
 {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1186 loncom/lonnet/perl/lonnet.pm:1.1187
--- loncom/lonnet/perl/lonnet.pm:1.1186	Tue Aug 21 04:04:58 2012
+++ loncom/lonnet/perl/lonnet.pm	Thu Aug 23 14:17:48 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1186 2012/08/21 04:04:58 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 @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 @@
         } 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 @@
                            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 @@
                            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;
 }




More information about the LON-CAPA-cvs mailing list