Merge remote-tracking branch 'origin/new/bug_5356'

[koha.git] / tools / viewlog.pl

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index a08c73f..e7d8e02 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
-
-# Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
+# Copyright 2011 MJ Ray and software.coop
 #
 # This file is part of Koha.
 #
@@ -14,11 +14,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -46,13 +47,12 @@ $debug or $debug = $cgi_debug;
 my $do_it    = $input->param('do_it');
 my @modules   = $input->param("modules");
 my $user     = $input->param("user");
-my $action   = $input->param("action");
+my @action   = $input->param("action");
 my $object   = $input->param("object");
 my $info     = $input->param("info");
 my $datefrom = $input->param("from");
 my $dateto   = $input->param("to");
 my $basename = $input->param("basename");
-my $mime     = $input->param("MIME");
 #my $del      = $input->param("sep");
 my $output   = $input->param("output") || "screen";
 my $src      = $input->param("src");    # this param allows us to be told where we were called from -fbcit
@@ -71,22 +71,26 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 if ($src eq 'circ') {   # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
     use C4::Members;
     my $borrowernumber = $object;
-    my $data = GetMember($borrowernumber,'borrowernumber');
+    my $data = GetMember('borrowernumber'=>$borrowernumber);
     my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
     $template->param( picture => 1 ) if $picture;
+    
     $template->param(   menu            => 1,
                         title           => $data->{'title'},
                         initials        => $data->{'initials'},
                         surname         => $data->{'surname'},
+                        othernames      => $data->{'othernames'},
                         borrowernumber  => $borrowernumber,
                         firstname       => $data->{'firstname'},
                         cardnumber      => $data->{'cardnumber'},
                         categorycode    => $data->{'categorycode'},
+                        category_type   => $data->{'category_type'},
                         categoryname   => $data->{'description'},
                         address         => $data->{'address'},
                         address2        => $data->{'address2'},
                         city            => $data->{'city'},
-                       zipcode         => $data->{'zipcode'},
+                        state           => $data->{'state'},
+                        zipcode         => $data->{'zipcode'},
                         phone           => $data->{'phone'},
                         phonepro        => $data->{'phonepro'},
                         email           => $data->{'email'},
@@ -101,39 +105,25 @@ $template->param(
                                       debug => $debug,
        C4::Search::enabled_staff_search_views,
 );
-#
-#### This code was never really used - maybe some day some will fix it ###
-#my @mime = ( C4::Context->preference("MIME") );
-#my $CGIextChoice = CGI::scrolling_list(
-#        -name     => 'MIME',
-#        -id       => 'MIME',
-#        -values   => \@mime,
-#        -size     => 1,
-#        -multiple => 0
-#);
-#my @dels         = ( C4::Context->preference("delimiter") );
-#my $CGIsepChoice = CGI::scrolling_list(
-#        -name     => 'sep',
-#        -id       => 'sep',
-#        -values   => \@dels,
-#        -size     => 1,
-#        -multiple => 0
-#);
-#$template->param(
-#        CGIextChoice => $CGIextChoice,
-#        CGIsepChoice => $CGIsepChoice,
-#);
-#
+
 if ($do_it) {
 
-    my $results = GetLogs($datefrom,$dateto,$user,\@modules,$action,$object,$info);
-    my $total = scalar @$results;
-    foreach my $result (@$results){
-       if ($result->{'info'} eq 'item'){
+    my @data;
+    my ($results,$modules,$action);
+    if ($action[0] ne '') { $action = \@action; } # match All means no limit
+    if ($modules[0] ne '') { $modules = \@modules; } # match All means no limit
+    $results = GetLogs($datefrom,$dateto,$user,$modules,$action,$object,$info);
+    @data=@$results;
+    my $total = scalar @data;
+    foreach my $result (@data){
+       if ($result->{'info'} eq 'item'||$result->{module} eq "CIRCULATION"){
            # get item information so we can create a working link
-           my $item=GetItem($result->{'object'});
+        my $itemnumber=$result->{'object'};
+        $itemnumber=$result->{'info'} if ($result->{module} eq "CIRCULATION");
+           my $item=GetItem($itemnumber);
            $result->{'biblionumber'}=$item->{'biblionumber'};
            $result->{'biblioitemnumber'}=$item->{'biblionumber'};              
+        $result->{'barcode'}=$item->{'barcode'};
        }
     }
     
@@ -142,13 +132,13 @@ if ($do_it) {
         $template->param (
                        logview => 1,
             total    => $total,
-            looprow  => $results,
+            looprow  => \@data,
             do_it    => 1,
             datefrom => $datefrom,
             dateto   => $dateto,
             user     => $user,
             object   => $object,
-            action   => $action,
+            action   => \@action,
             info     => $info,
             src      => $src,
         );
@@ -166,7 +156,7 @@ if ($do_it) {
             -filename   => "$basename.csv"
         );
         my $sep = C4::Context->preference("delimiter");
-        foreach my $line (@$results) {
+        foreach my $line (@data) {
             #next unless $modules[0] eq "catalogue";
                foreach (qw(timestamp firstname surname action info title author)) {
                        print $line->{$_} . $sep;