#
# 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>.
=head1 ysearch.pl
=cut
-use CGI;
+use CGI qw ( -utf8 );
use Modern::Perl;
-use JSON;
+use JSON qw( to_json );
use C4::Context;
-use C4::Charset;
-use C4::AuthoritiesMarc;
-use C4::Auth qw/check_cookie_auth/;
-use C4::Output;
+use C4::Charset qw( nsb_clean );
+use C4::Auth qw( check_cookie_auth );
+use C4::Output qw( output_with_http_headers );
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
-my $query = new CGI;
+my $query = CGI->new;
my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), { catalogue => 1 } );
exit 0;
}
- my $searchstr = $query->param('term');
+ my @value = $query->multi_param('term');
my $searchtype = $query->param('querytype');
- my @value;
- given ($searchtype) {
- when (/^marclist$/) { @value = (undef, undef, $searchstr); }
- when (/^mainentry$/) { @value = (undef, $searchstr, undef); }
- when (/^mainmainentry$/) { @value = ($searchstr, undef, undef); }
- }
my @marclist = ($searchtype);
my $authtypecode = $query->param('authtypecode');
- my @and_or = $query->param('and_or');
- my @excluding = $query->param('excluding');
- my @operator = $query->param('operator');
+ 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 $resultsperpage = 50;
my $startfrom = 0;
- my ( $results, $total ) = SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, $startfrom * $resultsperpage, $resultsperpage, $authtypecode, $orderby );
+ 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 * $resultsperpage;
+ my ( $results, $total ) =
+ $searcher->search_auth_compat( $search_query, $offset,
+ $resultsperpage );
my %used_summaries; # hash to avoid duplicates
my @summaries;