#
# 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 Modern::Perl;
-use CGI;
-use C4::Output;
-use C4::Auth;
+use CGI qw ( -utf8 );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
use C4::Context;
-use C4::AuthoritiesMarc;
-use C4::Acquisition;
-use C4::Koha;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
-my $query = new CGI;
+use Koha::Authority::Types;
+
+my $query = CGI->new;
my $op = $query->param('op') || '';
my $authtypecode = $query->param('authtypecode') || '';
my $index = $query->param('index') || '';
: 'authorities/auth_finder.tt',
query => $query,
type => 'intranet',
- authnotrequired => 0,
flagsrequired => { catalogue => 1 },
}
);
-# Authority types loop
-my $authtypes = C4::Koha::getauthtypes();
-my @authtypesloop;
-foreach my $thisauthtype ( keys %$authtypes ) {
- my %row = (
- value => $thisauthtype,
- selected => ( $thisauthtype eq $authtypecode ),
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- index => $index,
- );
- push @authtypesloop, \%row;
-}
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } );
# If search form posted
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 @value = (
$query->param('value_mainstr') || undef,
$query->param('value_main') || undef,
+ $query->param('value_match') || undef,
$query->param('value_any') || undef,
- $query->param('value_match') || undef
);
my $orderby = $query->param('orderby') || '';
my $startfrom = $query->param('startfrom') || 0;
my $resultsperpage = $query->param('resultsperpage') || 20;
+ 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
+ );
+ $template->param( search_query => $search_query ) if C4::Context->preference('DumpSearchQueryTemplate');
+ my $offset = $startfrom * $resultsperpage;
my ( $results, $total ) =
- SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value,
- $startfrom * $resultsperpage,
- $resultsperpage, $authtypecode, $orderby );
+ $searcher->search_auth_compat( $search_query, $offset,
+ $resultsperpage );
# multi page display gestion
my $displaynext = 0;
my @field_data = ();
# get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name)
- my @marclist_ini = $query->param('marclist');
+ my @marclist_ini = $query->multi_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 => "value_mainstr", val => $query->param('value_mainstr') || "" };
+ { term => "value_mainstr", val => scalar $query->param('value_mainstr') || "" };
push @field_data,
- { term => "value_main", val => $query->param('value_main') || "" };
+ { term => "value_main", val => scalar $query->param('value_main') || "" };
push @field_data,
- { term => "value_any", val => $query->param('value_any') || "" };
+ { term => "value_match", val => scalar $query->param('value_match') || "" };
push @field_data,
- { term => "value_match", val => $query->param('value_match') || "" };
+ { term => "value_any", val => scalar $query->param('value_any') || "" };
my @numbers = ();
if ( $total > $resultsperpage ) {
from => $from,
to => $to,
numbers => \@numbers,
- operator_mainstr => ( @operator > 0 && $operator[0] )
- ? $operator[0]
- : '',
- operator_main => ( @operator > 1 && $operator[1] ) ? $operator[1] : '',
- operator_any => ( @operator > 2 && $operator[2] ) ? $operator[2] : '',
- operator_match => ( @operator > 3 && $operator[3] ) ? $operator[3] : '',
+ operator_mainstr => ( @operator > 0 && $operator[0] ) ? $operator[0] : '',
+ operator_main => ( @operator > 1 && $operator[1] ) ? $operator[1] : '',
+ operator_match => ( @operator > 2 && $operator[2] ) ? $operator[2] : '',
+ operator_any => ( @operator > 3 && $operator[3] ) ? $operator[3] : '',
);
}
else {
$template->param(
op => $op,
- value_mainstr => $query->param('value_mainstr') || '',
- value_main => $query->param('value_main') || '',
- value_any => $query->param('value_any') || '',
- value_match => $query->param('value_match') || '',
+ value_mainstr => scalar $query->param('value_mainstr') || '',
+ value_main => scalar $query->param('value_main') || '',
+ value_any => scalar $query->param('value_any') || '',
+ value_match => scalar $query->param('value_match') || '',
tagid => $tagid,
index => $index,
- authtypesloop => \@authtypesloop,
+ authority_types => $authority_types,
authtypecode => $authtypecode,
source => $source,
relationship => $relationship,
projects / srvgit / blobdiff