Bug 14115: Silence warnings in t/Label*

[koha.git] / authorities / authorities-home.pl

diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index f67f5c9..6e13db6 100755 (executable)
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -4,23 +4,23 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use URI::Escape;
 use C4::Auth;
 
@@ -31,6 +31,7 @@ use C4::AuthoritiesMarc;
 use C4::Acquisition;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 use C4::Biblio;
+use C4::Search::History;
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -60,7 +61,7 @@ foreach my $thisauthtype (
 if ( $op eq "delete" ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/authorities-home.tmpl",
+            template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,
@@ -97,9 +98,10 @@ if ( $op eq "do_search" ) {
         $orderby
     );
 
+
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/searchresultlist.tmpl",
+            template_name   => "authorities/searchresultlist.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,
@@ -108,6 +110,25 @@ if ( $op eq "do_search" ) {
         }
     );
 
+    # search history
+    if (C4::Context->preference('EnableSearchHistory')) {
+        if ( $startfrom == 1) {
+            my $path_info = $query->url(-path_info=>1);
+            my $query_cgi_history = $query->url(-query=>1);
+            $query_cgi_history =~ s/^$path_info\?//;
+            $query_cgi_history =~ s/;/&/g;
+
+            C4::Search::History::add({
+                userid => $loggedinuser,
+                sessionid => $query->cookie("CGISESSID"),
+                query_desc => $value,
+                query_cgi => $query_cgi_history,
+                total => $total,
+                type => "authority",
+            });
+        }
+    }
+
     $template->param(
         marclist       => $marclist,
         and_or         => $and_or,
@@ -125,7 +146,7 @@ if ( $op eq "do_search" ) {
     # next/previous would not work anymore
 
     # construction of the url of each page
-    my $value_url = uri_escape($value);
+    my $value_url = uri_escape_utf8($value);
     my $base_url = "authorities-home.pl?"
       ."marclist=$marclist"
       ."&amp;and_or=$and_or"
@@ -168,7 +189,7 @@ if ( $op eq "do_search" ) {
 if ( $op eq '' ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/authorities-home.tmpl",
+            template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,