Bug 24488: perf - Group by at DBMS level

[srvgit] / opac / tracklinks.pl

diff --git a/opac/tracklinks.pl b/opac/tracklinks.pl
index 329addf..ab07f03 100755 (executable)
--- a/opac/tracklinks.pl
+++ b/opac/tracklinks.pl
@@ -22,18 +22,24 @@ use Modern::Perl;
 use C4::Context;
 use C4::Auth qw(checkauth);
 use C4::Biblio;
+use C4::Output;
 use Koha::Items;
 use Koha::Linktracker;
 use CGI qw ( -utf8 );
+use List::MoreUtils qw(any);
 
-my $cgi = new CGI;
+my $cgi = CGI->new;
 my $uri = $cgi->param('uri') || '';
 my $biblionumber = $cgi->param('biblionumber') || 0;
 my $itemnumber   = $cgi->param('itemnumber')   || 0;
 
+my $tracking_method = C4::Context->preference('TrackClicks');
+unless ( $tracking_method ) {
+    output_error( $cgi, '404' );
+    exit;
+}
 my $tracker = Koha::Linktracker->new(
-    { trackingmethod => C4::Context->preference('TrackClicks') } );
-
+    { trackingmethod => $tracking_method } );
 if ($uri && ($biblionumber || $itemnumber) ) {
     my $borrowernumber = 0;
 
@@ -54,9 +60,15 @@ if ($uri && ($biblionumber || $itemnumber) ) {
     }
 
     my $record = C4::Biblio::GetMarcBiblio({ biblionumber => $biblionumber });
-    my $marc_urls = C4::Biblio::GetMarcUrls($record, C4::Context->preference('marcflavour'));
-    if ( ( grep { $_ eq $uri } map { $_->{MARCURL} } @$marc_urls )
-        || Koha::Items->search( { itemnumber => $itemnumber, uri => $uri } )->count )
+    my $marc_urls = $record ? C4::Biblio::GetMarcUrls($record, C4::Context->preference('marcflavour')) : [];
+    my $search_crit = { uri => $uri };
+    if( $itemnumber ) { # itemnumber is leading over biblionumber
+        $search_crit->{itemnumber} = $itemnumber;
+    } elsif( $biblionumber ) {
+        $search_crit->{biblionumber} = $biblionumber;
+    }
+    if ( ( any { $_ eq $uri } map { $_->{MARCURL} } @$marc_urls )
+        || Koha::Items->search( $search_crit )->count )
     {
         $tracker->trackclick(
             {
@@ -71,5 +83,5 @@ if ($uri && ($biblionumber || $itemnumber) ) {
     }
 }
 
-print $cgi->redirect("/cgi-bin/koha/errors/404.pl");    # escape early
+output_error( $cgi, '404' );
 exit;