Bug 8015: (follow-up) don't require userenv

[koha.git] / circ / ysearch.pl

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index cdd2530..4a3663e 100755 (executable)
--- 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.
 #
@@ -15,9 +16,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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
 
@@ -25,14 +26,16 @@
 =cut
 
 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, ":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,19 +44,38 @@ if ($auth_status ne "ok") {
 }
 
 my $dbh = C4::Context->dbh;
-my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode 
-             FROM borrowers 
-             WHERE surname LIKE ?
-             OR firstname LIKE ?
-             ORDER BY surname, firstname);
-            #"OR cardnumber LIKE '" . $query . "%' " . 
+my $sql = q(
+    SELECT surname, firstname, cardnumber, address, city, zipcode, country
+    FROM borrowers
+    WHERE ( surname LIKE ?
+        OR firstname LIKE ?
+        OR cardnumber LIKE ? )
+);
+if (C4::Context->preference("IndependentBranches")){
+  if ( C4::Context->userenv
+      && (C4::Context->userenv->{flags} % 2) !=1
+      && 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%");
+$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} .
-          "\n";
+    if($i > 0){ print ","; }
+    print "{\"surname\":\"" . $rec->{surname} . "\",\"" .
+          "firstname\":\"".$rec->{firstname} . "\",\"" .
+          "cardnumber\":\"".$rec->{cardnumber} . "\",\"" .
+          "address\":\"".$rec->{address} . "\",\"" .
+          "city\":\"".$rec->{city} . "\",\"" .
+          "zipcode\":\"".$rec->{zipcode} . "\",\"" .
+          "country\":\"".$rec->{country} . "\"" .
+          "}";
+    $i++;
 }
+print "]";