X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fysearch.pl;h=8973902925659f6249dd27d8919c910c100a6436;hb=b16336caf8132d73ae71d78b4efe38df56029b81;hp=ce890f5b1924a9b5f29036133ffb92519c12cf45;hpb=cac6eb12502f82ed5a0b59a74cf84fa009ba0a26;p=koha_fer

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index ce890f5b19..8973902925 100755
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -3,6 +3,7 @@
 # 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.
 #
@@ -28,10 +29,11 @@ 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');
+my $query   = $input->param('term');
 
 binmode STDOUT, ":encoding(UTF-8)";
 print $input->header(-type => 'text/plain', -charset => 'UTF-8');
@@ -42,22 +44,39 @@ if ($auth_status ne "ok") {
 }
 
 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
-             LIMIT 10);
+my $sql = q(
+    SELECT borrowernumber, surname, firstname, cardnumber, address, city, zipcode, country
+    FROM borrowers
+    WHERE ( surname LIKE ?
+        OR firstname LIKE ?
+        OR cardnumber LIKE ? )
+);
+if (   C4::Context->preference("IndependentBranches")
+    && C4::Context->userenv
+    && !C4::Context->IsSuperLibrarian()
+    && C4::Context->userenv->{'branch'} )
+{
+    $sql .= " AND borrowers.branchcode ="
+      . $dbh->quote( C4::Context->userenv->{'branch'} );
+}
+
+$sql    .= q( ORDER BY surname, firstname LIMIT 10);
 my $sth = $dbh->prepare( $sql );
 $sth->execute("$query%", "$query%", "$query%");
 
+print "[";
+my $i = 0;
 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";
+    if($i > 0){ print ","; }
+    print "{\"borrowernumber\":\"" . $rec->{borrowernumber} . "\",\"" .
+          "surname\":\"".$rec->{surname} . "\",\"" .
+          "firstname\":\"".$rec->{firstname} . "\",\"" .
+          "cardnumber\":\"".$rec->{cardnumber} . "\",\"" .
+          "address\":\"".$rec->{address} . "\",\"" .
+          "city\":\"".$rec->{city} . "\",\"" .
+          "zipcode\":\"".$rec->{zipcode} . "\",\"" .
+          "country\":\"".$rec->{country} . "\"" .
+          "}";
+    $i++;
 }
+print "]";