X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fysearch.pl;h=beab6a1f4e0912997b69d1cd3031abd94db24816;hb=72f91afd9c7871b706d553cfbadf23d4f6db7e02;hp=f8fc52a88572a536415601df1e48d80075b60967;hpb=1e2faa91192302bde210e149963b42e8cfa8f97b;p=koha_gimpoz

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index f8fc52a885..beab6a1f4e 100755
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -28,12 +28,13 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Context;
+use C4::Members;
 use C4::Auth qw/check_cookie_auth/;
 
 my $input   = new CGI;
 my $query   = $input->param('query');
 
-binmode STDOUT, ":utf8";
+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 => '*' });
@@ -41,22 +42,11 @@ if ($auth_status ne "ok") {
     exit 0;
 }
 
-my $dbh = C4::Context->dbh;
-my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode, country 
-             FROM borrowers 
-             WHERE surname LIKE ?
-             OR firstname LIKE ?
-             OR cardnumber LIKE ?
-             ORDER BY surname, firstname);
-my $sth = $dbh->prepare( $sql );
-$sth->execute("$query%", "$query%", "$query%");
-
-while ( my $rec = $sth->fetchrow_hashref ) {
-    print $rec->{surname} . ", " . $rec->{firstname} . "\t" .
-          $rec->{cardnumber} . "\t" .
-          $rec->{address} . "\t" .
-          $rec->{city} . "\t" .
-          $rec->{zip} . "\t" .
-          $rec->{country} .
-          "\n";
-}
+print map $_->{surname} . ", " . $_->{firstname} . "\t" .
+          $_->{cardnumber} . "\t" .
+          $_->{address} . "\t" .
+          $_->{city} . "\t" .
+          $_->{zipcode} . "\t" .
+          $_->{country} .
+          "\n",
+          @{ Search($query, [qw(surname firstname cardnumber)], [10], [qw(surname firstname cardnumber address city zipcode country)]) };