9f6999bfdb
This patch (which is incidental to the main patches for bug 9282), improves the AJAX authority search code by fixing incorrect contruction of the parameters to SearchAuthorities() that led to errors like this in the Apache log when doing auto-completion searches on "main entry" and "anywhere" in the authority finder: ysearch.pl: Use of uninitialized value $i in string eq ... In the process, this patch also removes a use of the now-deprecated Perl smartmatch operator. To test: [1] Verify that the main test plan for bug 9282 still works. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
87 lines
2.8 KiB
Perl
Executable file
87 lines
2.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
|
|
|
|
# Copyright 2011 BibLibre
|
|
# Parts copyright 2012 Athens County Public Libraries
|
|
#
|
|
# 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 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.
|
|
|
|
=head1 ysearch.pl
|
|
|
|
This script allows ajax call for dynamic authorities search
|
|
(used in auth_finder.pl)
|
|
|
|
=cut
|
|
|
|
use CGI;
|
|
use Modern::Perl;
|
|
use JSON;
|
|
|
|
use C4::Context;
|
|
use C4::Charset;
|
|
use C4::AuthoritiesMarc;
|
|
use C4::Auth qw/check_cookie_auth/;
|
|
use C4::Output;
|
|
|
|
my $query = new CGI;
|
|
|
|
my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), { catalogue => 1 } );
|
|
|
|
if ( $auth_status ne "ok" ) {
|
|
# send empty response
|
|
my $reply = CGI->new("");
|
|
print $reply->header(-type => 'text/html');
|
|
exit 0;
|
|
}
|
|
|
|
my @value = $query->param('term');
|
|
my $searchtype = $query->param('querytype');
|
|
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 $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 %used_summaries; # hash to avoid duplicates
|
|
my @summaries;
|
|
foreach my $result (@$results) {
|
|
my $authorized = $result->{'summary'}->{'authorized'};
|
|
my $summary = join(
|
|
' ',
|
|
map {
|
|
( $searchtype eq 'mainmainentry' )
|
|
? $_->{'hemain'}
|
|
: $_->{'heading'}
|
|
} @$authorized
|
|
);
|
|
$summary =~ s/^\s+//;
|
|
$summary =~ s/\s+$//;
|
|
$summary = nsb_clean($summary);
|
|
# test if already added ignoring case
|
|
unless ( exists $used_summaries{ lc($summary) } ) {
|
|
push @summaries, { 'summary' => $summary };
|
|
$used_summaries{ lc($summary) } = 1;
|
|
}
|
|
}
|
|
|
|
output_with_http_headers $query, undef, to_json(\@summaries, { utf8 => 1 }), 'json';
|