bug 2297: improve ModBiblio() to avoid duplicate item fields

[koha-ffzg.git] / C4 / Log.pm

diff --git a/C4/Log.pm b/C4/Log.pm
index c6ee750..b4732ac 100644 (file)
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -1,4 +1,4 @@
-package C4::Log; #assumes C4/Log
+package C4::Log;
 
 #package to deal with Logging Actions in DB
 
@@ -24,12 +24,15 @@ use strict;
 use C4::Context;
 use C4::Dates qw(format_date);
 
-require Exporter;
-
 use vars qw($VERSION @ISA @EXPORT);
 
-# set the version for version checking
-$VERSION = 3.01;
+BEGIN {
+       # set the version for version checking
+       $VERSION = 3.01;
+       require Exporter;
+       @ISA = qw(Exporter);
+       @EXPORT = qw(&logaction &GetLogStatus &displaylog &GetLogs);
+}
 
 =head1 NAME
 
@@ -47,23 +50,27 @@ The functions in this module perform various functions in order to log all the o
 
 =over 2
 
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(&logaction &GetLogStatus &displaylog &GetLogs);
-
 =item logaction
 
-  &logaction($usernumber, $modulename, $actionname, $objectnumber, $infos);
+  &logaction($modulename, $actionname, $objectnumber, $infos);
 
-Adds a record into action_logs table to report the different changes upon the database
+Adds a record into action_logs table to report the different changes upon the database.
+Each log entry includes the number of the user currently logged in.  For batch
+jobs, which operate without authenticating a user and setting up a session, the user
+number is set to 0, which is the same as the superlibrarian's number.
 
 =cut
 
 #'
 sub logaction {
-  my ($usernumber,$modulename, $actionname, $objectnumber, $infos)=@_;
-    $usernumber='' unless $usernumber;
+    my ($modulename, $actionname, $objectnumber, $infos)=@_;
+
+    # Get ID of logged in user.  if called from a batch job,
+    # no user session exists and C4::Context->userenv() returns
+    # the scalar '0'.
+    my $userenv = C4::Context->userenv();
+    my $usernumber = (ref($userenv) eq 'HASH') ? $userenv->{'number'} : 0;
+
     my $dbh = C4::Context->dbh;
     my $sth=$dbh->prepare("Insert into action_logs (timestamp,user,module,action,object,info) values (now(),?,?,?,?,?)");
     $sth->execute($usernumber,$modulename,$actionname,$objectnumber,$infos);
@@ -190,21 +197,24 @@ sub GetLogs {
     my $action   = shift;
     my $object   = shift;
     my $info     = shift;
-    
+   
+    my $iso_datefrom = C4::Dates->new($datefrom,C4::Context->preference("dateformat"))->output('iso');
+    my $iso_dateto = C4::Dates->new($dateto,C4::Context->preference("dateformat"))->output('iso');
+
     my $dbh = C4::Context->dbh;
     my $query = "
         SELECT *
         FROM   action_logs
         WHERE 1
     ";
-    $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$datefrom."\" " if $datefrom;
-    $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"".$dateto."\" " if $dateto;
+    $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') >= \"".$iso_datefrom."\" " if $iso_datefrom;
+    $query .= " AND DATE_FORMAT(timestamp, '%Y-%m-%d') <= \"".$iso_dateto."\" " if $iso_dateto;
     $query .= " AND user LIKE \"%".$user."%\" "     if $user;
     $query .= " AND module LIKE \"%".$module."%\" " if $module;
     $query .= " AND action LIKE \"%".$action."%\" " if $action;
     $query .= " AND object LIKE \"%".$object."%\" " if $object;
     $query .= " AND info LIKE \"%".$info."%\" "     if $info;
-    
+   
     my $sth = $dbh->prepare($query);
     $sth->execute;
     
@@ -216,8 +226,6 @@ sub GetLogs {
     return \@logs;
 }
 
-END { }       # module clean-up code here (global destructor)
-
 1;
 __END__