#
# 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 C4::Auth;
+use CGI qw ( -utf8 );
+use URI::Escape;
+use POSIX qw( ceil );
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::AuthoritiesMarc;
use C4::Acquisition;
-use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Koha;
use C4::Biblio;
+use C4::Search::History;
+
+use Koha::Authority::Types;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
+use Koha::Token;
+use Koha::Z3950Servers;
-my $query = new CGI;
-my $op = $query->param('op');
-$op ||= q{};
-my $authtypecode = $query->param('authtypecode');
-$authtypecode ||= q{};
-my $dbh = C4::Context->dbh;
+my $query = new CGI;
+my $dbh = C4::Context->dbh;
+my $op = $query->param('op') || '';
+my $authtypecode = $query->param('authtypecode') || '';
+my $authid = $query->param('authid') || '';
-my $authid = $query->param('authid');
my ( $template, $loggedinuser, $cookie );
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( sort { $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'} }
- keys %$authtypes )
-{
- my %row = (
- value => $thisauthtype,
- selected => $thisauthtype eq $authtypecode,
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- );
- push @authtypesloop, \%row;
-}
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } );
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,
debug => 1,
}
);
- &DelAuthority( $authid, 1 );
- $op = "do_search";
+ die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
+ session_id => scalar $query->cookie('CGISESSID'),
+ token => scalar $query->param('csrf_token'),
+ });
+
+ DelAuthority({ authid => $authid });
+
+ if ( $query->param('operator') ) {
+ # query contains search params so perform search
+ $op = "do_search";
+ }
+ else {
+ $op = '';
+ }
}
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 $orderby = $query->param('orderby');
- my @value = $query->param('value');
+ 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('value') || '';
my $startfrom = $query->param('startfrom') || 1;
my $resultsperpage = $query->param('resultsperpage') || 20;
-
- my ( $results, $total ) =
- SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value,
- ( $startfrom - 1 ) * $resultsperpage,
- $resultsperpage, $authtypecode, $orderby );
+ my $offset = ( $startfrom - 1 ) * $resultsperpage + 1;
+
+ 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 ( $results, $total ) = $searcher->search_auth_compat(
+ $search_query, $offset, $resultsperpage
+ );
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "authorities/searchresultlist.tmpl",
+ template_name => "authorities/searchresultlist.tt",
query => $query,
type => 'intranet',
authnotrequired => 0,
);
$template->param(
- marclist => $query->param('marclist'),
- and_or => $query->param('and_or'),
- excluding => $query->param('excluding'),
- operator => $query->param('operator'),
- orderby => $query->param('orderby'),
- value => $query->param('value'),
- authtypecode => $query->param('authtypecode'),
+ csrf_token => Koha::Token->new->generate_csrf({
+ session_id => scalar $query->cookie('CGISESSID'),
+ }),
+ );
+
+ # 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,
+ excluding => $excluding,
+ operator => $operator,
+ orderby => $orderby,
+ value => $value,
+ authtypecode => $authtypecode,
startfrom => $startfrom,
resultsperpage => $resultsperpage,
);
- my @field_data = ();
-
# 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++ ) {
- if ($value[$i]){
- push @field_data, { term => "marclist", val => $marclist_ini[$i] };
- if (!defined $and_or[$i]) {
- $and_or[$i] = q{};
- }
- push @field_data, { term => "and_or", val => $and_or[$i] };
- if (!defined $excluding[$i]) {
- $excluding[$i] = q{};
- }
- push @field_data, { term => "excluding", val => $excluding[$i] };
- push @field_data, { term => "operator", val => $operator[$i] };
- push @field_data, { term => "value", val => $value[$i] };
- }
- }
# construction of the url of each page
- my $base_url =
- 'authorities-home.pl?'
- . join( '&', map { $_->{term} . '=' . $_->{val} } @field_data )
- . '&'
- . join(
- '&',
- map { $_->{term} . '=' . $_->{val} } (
- { term => 'resultsperpage', val => $resultsperpage },
- { term => 'type', val => 'intranet' },
- { term => 'op', val => 'do_search' },
- { term => 'authtypecode', val => $authtypecode },
- { term => 'orderby', val => $orderby },
- )
- );
+ my $value_url = uri_escape_utf8($value);
+ my $base_url = "authorities-home.pl?"
+ ."marclist=$marclist"
+ ."&and_or=$and_or"
+ ."&excluding=$excluding"
+ ."&operator=$operator"
+ ."&value=$value_url"
+ ."&resultsperpage=$resultsperpage"
+ ."&type=intranet"
+ ."&op=do_search"
+ ."&authtypecode=$authtypecode"
+ ."&orderby=$orderby";
my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
my $to;
- if (!defined $total) {
+ if ( !defined $total ) {
$total = 0;
}
$template->param( result => $results ) if $results;
+ my $max_result_window = $searcher->max_result_window;
+ my $hits_to_paginate = ($max_result_window && $max_result_window < $total) ? $max_result_window : $total;
+
$template->param(
pagination_bar => pagination_bar(
- $base_url, int( $total / $resultsperpage ) + 1,
+ $base_url, ceil( $hits_to_paginate / $resultsperpage ),
$startfrom, 'startfrom'
),
- total => $total,
- from => $from,
- to => $to,
- isEDITORS => $authtypecode eq 'EDITORS',
+ total => $total,
+ hits_to_paginate => $hits_to_paginate,
+ from => $from,
+ to => $to,
+ isEDITORS => $authtypecode eq 'EDITORS',
);
}
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,
}
+my $servers = Koha::Z3950Servers->search(
+ {
+ recordtype => 'authority',
+ servertype => ['zed', 'sru'],
+ },
+);
+
$template->param(
- authtypesloop => \@authtypesloop,
+ servers => $servers,
+ authority_types => $authority_types,
+ op => $op,
);
$template->{VARS}->{marcflavour} = C4::Context->preference("marcflavour");
projects / koha.git / blobdiff