Kyle M Hall
1871d9a6e7
The script that returns data for the patron autocomplete does not use C4::Members::Search. Instead it uses bespoke code that does not behave like the traditional search and is very limited in how it can search. If, for example, I search for "Kyle Hall" in the standard search, I would get "Kyle Hall" back as a result. For the autocomplete search, I will not. This script should use C4::Members::Search to provide better searching and to keep the code base DRY. Test Plan: 1) Enable the system preference CircAutocompl 2) Create a user with the first name "Test" and the surname "User" 3) Perform a checkout autocomplete search for "Test User" 4) Note you do not get the user as a result 5) Apply this patch 6) Try different combinations of "Test" and "User" such as Test User User Test U Test Test U etc. 7) Note these searches now work Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
93 lines
2.6 KiB
Perl
Executable file
93 lines
2.6 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 2007 Tamil s.a.r.l.
|
|
# Parts copyright 2010-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 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.
|
|
#
|
|
# 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 Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Context;
|
|
use C4::Auth qw/check_cookie_auth/;
|
|
use Koha::Borrowers;
|
|
|
|
use JSON qw( to_json );
|
|
|
|
my $input = new CGI;
|
|
my $query = $input->param('term');
|
|
|
|
binmode STDOUT, ":encoding(UTF-8)";
|
|
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
|
|
|
|
my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { circulate => '*' } );
|
|
if ( $auth_status ne "ok" ) {
|
|
exit 0;
|
|
}
|
|
|
|
my $limit_on_branch;
|
|
if ( C4::Context->preference("IndependentBranches")
|
|
&& C4::Context->userenv
|
|
&& !C4::Context->IsSuperLibrarian()
|
|
&& C4::Context->userenv->{'branch'} ) {
|
|
$limit_on_branch = 1;
|
|
}
|
|
|
|
my @parts = split( / /, $query );
|
|
my @params;
|
|
foreach my $p (@parts) {
|
|
push(
|
|
@params,
|
|
-or => [
|
|
surname => { -like => "$p%" },
|
|
firstname => { -like => "$p%" },
|
|
cardnumber => { -like => "$p%" },
|
|
]
|
|
);
|
|
}
|
|
|
|
push( @params, { branchcode => C4::Context->userenv->{branch} } ) if $limit_on_branch;
|
|
|
|
my $borrowers_rs = Koha::Borrowers->search(
|
|
{ -and => \@params },
|
|
{
|
|
# Get the first 10 results
|
|
page => 1,
|
|
rows => 10,
|
|
order_by => [ 'surname', 'firstname' ],
|
|
},
|
|
);
|
|
|
|
my @borrowers;
|
|
while ( my $b = $borrowers_rs->next ) {
|
|
push @borrowers,
|
|
{ borrowernumber => $b->borrowernumber,
|
|
surname => $b->surname // '',
|
|
firstname => $b->firstname // '',
|
|
cardnumber => $b->cardnumber // '',
|
|
address => $b->address // '',
|
|
city => $b->city // '',
|
|
zipcode => $b->zipcode // '',
|
|
country => $b->country // '',
|
|
};
|
|
}
|
|
|
|
print to_json( \@borrowers );
|