#
# 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 C4::Auth;
use C4::Context;
use C4::Output;
use C4::AuthoritiesMarc;
use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Search::History;
+
+use Koha::Authority::Types;
my $query = new CGI;
my $op = $query->param('op') || '';
my ( $template, $loggedinuser, $cookie );
my $resultsperpage;
-my $authtypes = getauthtypes();
-my @authtypesloop = ();
-foreach my $thisauthtype (
- sort {
- $authtypes->{$a}->{'authtypetext'}
- cmp $authtypes->{$b}->{'authtypetext'}
- }
- keys %{$authtypes}
- ) {
- push @authtypesloop,
- { value => $thisauthtype,
- selected => $thisauthtype eq $authtypecode,
- authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
- };
-}
+my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']});
if ( $op eq "do_search" ) {
- my @marclist = ($query->param('marclista'),$query->param('marclistb'),$query->param('marclistc'));
- my @and_or = ($query->param('and_ora'),$query->param('and_orb'),$query->param('and_orc'));
- my @excluding = ($query->param('excludinga'),$query->param('excludingb'),$query->param('excludingc'),);
- my @operator = ($query->param('operatora'),$query->param('operatorb'),$query->param('operatorc'));
+ my @marclist = ($query->param('marclist'));
+ my @and_or = ($query->param('and_or'));
+ my @excluding = ($query->param('excluding'),);
+ my @operator = ($query->param('operator'));
my $orderby = $query->param('orderby');
- my @value = ($query->param('valuea') || "",$query->param('valueb') || "",$query->param('valuec') || "",);
+ my @value = ($query->param('value') || "",);
$resultsperpage = $query->param('resultsperpage');
$resultsperpage = 20 if ( !defined $resultsperpage );
$resultsperpage, $authtypecode, $orderby );
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "opac-authoritiessearchresultlist.tmpl",
+ template_name => "opac-authoritiessearchresultlist.tt",
query => $query,
type => 'opac',
authnotrequired => 1,
$displaynext = 1;
}
- my @field_data = ();
-
- foreach my $letter (qw/a b c/){
- push @field_data, { term => "marclist$letter" , val => $query->param("marclist$letter") || ''};
- push @field_data, { term => "and_or$letter" , val => $query->param("and_or$letter") || ''};
- push @field_data, { term => "excluding$letter" , val => $query->param("excluding$letter") || ''};
- push @field_data, { term => "operator$letter" , val => $query->param("operator$letter") || ''};
- push @field_data, { term => "value$letter" , val => $query->param("value$letter") || ''};
- }
+ my @field_data = (
+ { term => "marclist", val => $marclist[0] },
+ { term => "and_or", val => $and_or[0] },
+ { term => "excluding", val => $excluding[0] },
+ { term => "operator", val => $operator[0] },
+ { term => "value", val => $value[0] },
+ );
my @numbers = ();
else {
$to = ( ( $startfrom + 1 ) * $resultsperpage );
}
+ unless (C4::Context->preference('OPACShowUnusedAuthorities')) {
+ my @usedauths = grep { $_->{used} > 0 } @$results;
+ $results = \@usedauths;
+ }
+
+ # Opac search history
+ if (C4::Context->preference('EnableOpacSearchHistory')) {
+ unless ( $startfrom ) {
+ 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;
+
+ unless ( $loggedinuser ) {
+ my $new_search = C4::Search::History::add_to_session({
+ cgi => $query,
+ query_desc => $value[0],
+ query_cgi => $query_cgi_history,
+ total => $total,
+ type => "authority",
+ });
+ } else {
+ # To the session (the user is logged in)
+ C4::Search::History::add({
+ userid => $loggedinuser,
+ sessionid => $query->cookie("CGISESSID"),
+ query_desc => $value[0],
+ query_cgi => $query_cgi_history,
+ total => $total,
+ type => "authority",
+ });
+ }
+ }
+ }
+
$template->param( result => $results ) if $results;
$template->param( FIELDS => \@fields );
$template->param( orderby => $orderby );
startfromnext => $startfrom + 1,
startfromprev => $startfrom - 1,
searchdata => \@field_data,
+ countfuzzy => !(C4::Context->preference('OPACShowUnusedAuthorities')),
total => $total,
from => $from,
to => $to,
+ resultcount => scalar @$results,
numbers => \@numbers,
authtypecode => $authtypecode,
- authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
+ authtypetext => $authority_types->find($authtypecode)->authtypetext,
isEDITORS => $authtypecode eq 'EDITORS',
);
else {
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "opac-authorities-home.tmpl",
+ template_name => "opac-authorities-home.tt",
query => $query,
type => 'opac',
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
}
-$template->param( authtypesloop => \@authtypesloop );
+$template->param(
+ authority_types => $authority_types,
+ authtypecode => $authtypecode,
+);
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;