b50641b479
Adds regex to the split() of the passed parameters to improve searching. Test plan 1. Go to Course Reserves module. 2. Press New course button. 3. Make active the instructor search box. 4. Start typing the last name of a patron that exists in your database. 5. At the end of the last name type ", " and try to add a first name. 6. The search should fail. 7. Apply the patch. 8. Follow steps 1-5 again. 9. You should now be able to search using the following methods 9a. surname, firstname 9b. firstname surname Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
95 lines
2.7 KiB
Perl
Executable file
95 lines
2.7 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::Patrons;
|
|
use Koha::DateUtils qw/format_sqldatetime/;
|
|
|
|
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'), { catalogue => '1' } );
|
|
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( /,\s|\s/, $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::Patrons->search_limited(
|
|
{ -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 // '',
|
|
dateofbirth => format_sqldatetime($b->dateofbirth, undef, undef, 1) // '',
|
|
address => $b->address // '',
|
|
city => $b->city // '',
|
|
zipcode => $b->zipcode // '',
|
|
country => $b->country // '',
|
|
};
|
|
}
|
|
|
|
print to_json( \@borrowers );
|