X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=authorities%2Fauthorities-home.pl;h=3f400722c3edef15542544c2fe13c015062157ef;hb=b75d9dc25800fde1218ca9896e3a69a8da54de96;hp=edf02a5989ee00e3a10ed363e1d1f400c004047b;hpb=f0fc240e91634bc538a527b79d0fae4af96abaa0;p=koha.git diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index edf02a5989..3f400722c3 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -4,23 +4,24 @@ # # 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 . use strict; use warnings; -use CGI; +use CGI qw ( -utf8 ); +use URI::Escape; use C4::Auth; use C4::Context; @@ -28,51 +29,79 @@ 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; -my $query = new CGI; -my $op = $query->param('op'); -$op ||= q{}; -my $authtypecode = $query->param('authtypecode'); -$authtypecode ||= q{}; -my $dbh = C4::Context->dbh; +use Koha::Authority::Types; +use Koha::SearchEngine::Search; +use Koha::SearchEngine::QueryBuilder; +use Koha::Token; +use Koha::Z3950Servers; + +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'}, +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.tt", + query => $query, + type => 'intranet', + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + debug => 1, + } ); - push @authtypesloop, \%row; -} + 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 ); -# use Data::Dumper; warn Data::Dumper::Dumper(@$results); + 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, $startfrom, $resultsperpage + ); + ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "authorities/searchresultlist.tmpl", + template_name => "authorities/searchresultlist.tt", query => $query, type => 'intranet', authnotrequired => 0, @@ -81,47 +110,64 @@ if ( $op eq "do_search" ) { } ); - my @field_data = (); + $template->param( + 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, + ); # 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; } @@ -146,13 +192,10 @@ if ( $op eq "do_search" ) { ); } -elsif ( $op eq "delete" ) { - - &DelAuthority( $authid, 1 ); - +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, @@ -162,23 +205,21 @@ elsif ( $op eq "delete" ) { ); } -else { - ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "authorities/authorities-home.tmpl", - query => $query, - type => 'intranet', - authnotrequired => 0, - flagsrequired => { catalogue => 1 }, - debug => 1, - } - ); -} +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"); + # Print the page output_html_with_http_headers $query, $cookie, $template->output;