[Koha-cvs] CVS: koha/C4 Log.pm,1.1,1.2

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18248/C4

Modified Files:
        Log.pm 
Log Message:
Adding an object field to action_logs.
+ Minor Correction to updatedatabase
Changing Activate_Log from choice to YesNo Variable.


Index: Log.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Log.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Log.pm      15 Jul 2005 16:10:33 -0000      1.1
--- Log.pm      19 Jul 2005 16:48:15 -0000      1.2
***************
*** 61,68 ****
  #'
  sub logaction{
!   my ($usernumber,$modulename, $actionname, $infos)address@hidden;
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("Insert into action_logs 
(timestamp,user,module,action,info) values (now(),?,?,?,?)");
!       $sth->execute($usernumber,$modulename,$actionname,$infos);
        $sth->finish;
  }
--- 61,68 ----
  #'
  sub logaction{
!   my ($usernumber,$modulename, $actionname, $objectnumber, 
$infos)address@hidden;
        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);
        $sth->finish;
  }
***************
*** 77,89 ****
  #'
  sub logstatus{
!   my ($usernumber,$modulename, $actionname, $infos)address@hidden;
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("select value from systempreferences where 
variable='Activate_Log'");
        $sth->execute;
!       my ($var)=$sth->fetchrow;
!       $sth->finish;
!       return ($var eq "On"?"True":"")
  }
- 
  END { }       # module clean-up code here (global destructor)
  
--- 77,136 ----
  #'
  sub logstatus{
!       return C4::Context->preference("Activate_Log");
! }
! 
! =item displaylog
! 
!   &displaylog($modulename, @filters);
!   $modulename is the name of the module on which the user wants to display 
logs
!   @filters is an optional table of hash containing :
!       - name : the name of the variable to filter
!       - value : the value of the filter.... May be with * joker
! 
! returns a table of hash containing who did what on which object at what time
! 
! =cut
! #'
! sub displaylog{
!   my ($modulename, @filters)address@hidden;
        my $dbh = C4::Context->dbh;
!       my $strsth;
!       if ($modulename eq "acqui.simple"){
!               $strsth="select action_logs.timestamp, action_logs.action, 
borrowers.cardnumber, borrowers.surname, borrowers.firstname, 
borrowers.userid,";
!               $strsth .= "biblio.biblionumber, biblio.title, biblio.author" 
;#if ($modulename eq "acqui.simple");
!               $strsth .= "FROM borrowers,action_logs ";
!               $strsth .= ",biblio" ;#if ($modulename eq "acqui.simple");
!       
!               $strsth .="WHERE borrowers.borrowernumber=action_logs.user";
!               $strsth .= "AND action_logs.module = 'acqui.simple' AND 
action_logs.object=biblio.biblionumber ";# if ($modulename eq "acqui.simple");
!               if (@filters){
!                       foreach my $filter (@filters){
!                               if ($filter->{name} =~ /user/){
!                                       $filter->{value}=~s/\*/%/g;
!                                       $strsth .= " AND borrowers.surname like 
".$filter->{value};
!                               }elsif ($filter->{name} =~ /title/){
!                                       $filter->{value}=~s/\*/%/g;
!                                       $strsth .= " AND biblio.title like 
".$filter->{value};
!                               }elsif ($filter->{name} =~ /author/){
!                                       $filter->{value}=~s/\*/%/g;
!                                       $strsth .= " AND biblio.author like 
".$filter->{value};
!                               }
!                       }
!               }
!       } elsif ($modulename eq "acqui")  {
!       } elsif ($modulename eq "circ")   {
!       } elsif ($modulename eq "members"){
!       }
!       warn "displaylog :".$strsth;
!       my $sth=$dbh->prepare($strsth);
        $sth->execute;
!       my @results;
!       my $count;
!       while (my $data = $sth->fetchrow_hashref){
!               push @results, $data;
!               $count++;
!       }
!       return ($count, address@hidden);
  }
  END { }       # module clean-up code here (global destructor)