#
# 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., 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, see <http://www.gnu.org/licenses>.
-use strict;
-require Exporter;
-use CGI;
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
+use URI::Escape;
use C4::Auth;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::AuthoritiesMarc;
-use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Koha;
+use C4::Search::History;
+
+use Koha::Authority::Types;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
my $query = new CGI;
-my $op = $query->param('op');
-my $authtypecode = $query->param('authtypecode');
+my $op = $query->param('op') || '';
+my $authtypecode = $query->param('authtypecode') || '';
my $dbh = C4::Context->dbh;
-my $startfrom = $query->param('startfrom');
+my $startfrom = $query->param('startfrom') || 1;
+my $resultsperpage = $query->param('resultsperpage') || 20;
my $authid = $query->param('authid');
-$startfrom = 0 if ( !defined $startfrom );
my ( $template, $loggedinuser, $cookie );
-my $resultsperpage;
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( sort { $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'} }
- keys %$authtypes )
-{
- my $selected = 1 if $thisauthtype eq $authtypecode;
- my %row = (
- value => $thisauthtype,
- selected => $selected,
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- );
- push @authtypesloop, \%row;
-}
+
+my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']});
if ( $op eq "do_search" ) {
- my @marclist = $query->param('marclist');
- my @and_or = $query->param('and_or');
- my @excluding = $query->param('excluding');
- my @operator = $query->param('operator');
+ my @marclist = $query->multi_param('marclist');
+ my @and_or = $query->multi_param('and_or');
+ my @excluding = $query->multi_param('excluding');
+ my @operator = $query->multi_param('operator');
my $orderby = $query->param('orderby');
- my @value = $query->param('value');
-
- $resultsperpage = $query->param('resultsperpage');
- $resultsperpage = 20 if ( !defined $resultsperpage );
- my @tags;
- my ( $results, $total, @fields ) =
- SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator,
- \@value, $startfrom * $resultsperpage,
- $resultsperpage, $authtypecode, $orderby );
+ my @value = $query->multi_param('value');
+ $value[0] ||= q||;
+
+ my $builder = Koha::SearchEngine::QueryBuilder->new(
+ { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+ my $searcher = Koha::SearchEngine::Search->new(
+ { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+ my $search_query = $builder->build_authorities_query_compat( \@marclist, \@and_or,
+ \@excluding, \@operator, \@value, $authtypecode, $orderby );
+ my $offset = ( $startfrom - 1 ) * $resultsperpage + 1;
+ my ( $results, $total ) =
+ $searcher->search_auth_compat( $search_query, $offset, $resultsperpage );
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "opac-authoritiessearchresultlist.tmpl",
+ template_name => "opac-authoritiessearchresultlist.tt",
query => $query,
type => 'opac',
authnotrequired => 1,
debug => 1,
}
);
+ $template->param( search_query => $search_query ) if C4::Context->preference('DumpSearchQueryTemplate');
# multi page display gestion
- my $displaynext = 0;
- my $displayprev = $startfrom;
- if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
- $displaynext = 1;
+ my $value_url = uri_escape_utf8($value[0]);
+ my $base_url = "opac-authorities-home.pl?"
+ ."marclist=$marclist[0]"
+ ."&and_or=$and_or[0]"
+ ."&excluding=$excluding[0]"
+ ."&operator=$operator[0]"
+ ."&value=$value_url"
+ ."&resultsperpage=$resultsperpage"
+ ."&type=opac"
+ ."&op=do_search"
+ ."&authtypecode=$authtypecode"
+ ."&orderby=$orderby";
+
+ my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
+ my $to;
+ if ( !defined $total ) {
+ $total = 0;
}
- my @field_data = ();
+ if ( $total < $startfrom * $resultsperpage ) {
+ $to = $total;
+ }
+ else {
+ $to = $startfrom * $resultsperpage;
+ }
+
+ $template->param( result => $results ) if $results;
-# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore
- my @marclist_ini = $query->param('marclist');
- for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
- push @field_data, { term => "marclist", val => $marclist_ini[$i] };
- push @field_data, { term => "and_or", val => $and_or[$i] };
- push @field_data, { term => "excluding", val => $excluding[$i] };
- push @field_data, { term => "operator", val => $operator[$i] };
- push @field_data, { term => "value", val => $value[$i] };
+ $template->param(
+ pagination_bar => pagination_bar(
+ $base_url, int( $total / $resultsperpage ) + 1,
+ $startfrom, 'startfrom'
+ ),
+ total => $total,
+ from => $from,
+ to => $to,
+ );
+
+ unless (C4::Context->preference('OPACShowUnusedAuthorities')) {
+# TODO implement usage counts
+# my @usedauths = grep { $_->{used} > 0 } @$results;
+# $results = \@usedauths;
}
- my @numbers = ();
-
- if ( $total > $resultsperpage ) {
- for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
- if ( $i < 16 ) {
- my $highlight = 0;
- ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
- push @numbers,
- {
- number => $i,
- highlight => $highlight,
- searchdata => \@field_data,
- startfrom => ( $i - 1 )
- };
+ # Opac search history
+ if (C4::Context->preference('EnableOpacSearchHistory')) {
+ 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;
+
+ 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",
+ });
}
}
}
- my $from = $startfrom * $resultsperpage + 1;
- my $to;
-
- if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
- $to = $total;
- }
- else {
- $to = ( ( $startfrom + 1 ) * $resultsperpage );
- }
- $template->param( result => $results ) if $results;
- $template->param( FIELDS => \@fields );
$template->param( orderby => $orderby );
$template->param(
startfrom => $startfrom,
- displaynext => $displaynext,
- displayprev => $displayprev,
resultsperpage => $resultsperpage,
- startfromnext => $startfrom + 1,
- startfromprev => $startfrom - 1,
- searchdata => \@field_data,
- total => $total,
- from => $from,
- to => $to,
- numbers => \@numbers,
+ countfuzzy => !(C4::Context->preference('OPACShowUnusedAuthorities')),
+ resultcount => scalar @$results,
authtypecode => $authtypecode,
+ 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 => 1,
+ authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
debug => 1,
}
);
}
-$template->param( authtypesloop => \@authtypesloop );
+$template->param(
+ authority_types => $authority_types,
+ authtypecode => $authtypecode,
+);
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha-equinox.git / blobdiff