X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=cataloguing%2Fysearch.pl;h=7216d559b05597191c1af115406e6a1ed569abdb;hb=aa726e5329cda74f78e97c6ce379cfba93ea26f4;hp=9c69939171ec915b862e73918277a2c252e29346;hpb=588cc04571bd4eab1878c4abcac883ebe3ad060e;p=srvgit

diff --git a/cataloguing/ysearch.pl b/cataloguing/ysearch.pl
index 9c69939171..7216d559b0 100755
--- a/cataloguing/ysearch.pl
+++ b/cataloguing/ysearch.pl
@@ -6,18 +6,18 @@
 #
 # 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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
 
@@ -25,12 +25,13 @@
 =cut
 
 use Modern::Perl;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Charset;
-use C4::Auth qw/check_cookie_auth/;
+use C4::Charset qw( nsb_clean );
+use C4::Auth qw( check_cookie_auth );
+use JSON qw( to_json );
 
-my $input = new CGI;
+my $input = CGI->new;
 my $query = $input->param('term');
 my $table = $input->param('table');
 my $field = $input->param('field');
@@ -41,7 +42,7 @@ die() unless ($table eq "biblioitems");
 binmode STDOUT, ":encoding(UTF-8)";
 print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
 
-my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { editcatalogue => '*' } );
+my ( $auth_status ) = check_cookie_auth( $input->cookie('CGISESSID'), { editcatalogue => '*' } );
 if ( $auth_status ne "ok" ) {
     exit 0;
 }
@@ -54,14 +55,9 @@ $sql .= qq( ORDER BY $field);
 my $sth = $dbh->prepare($sql);
 $sth->execute("$query%", "% $query%", "%-$query%");
 
-print "[";
-my $i = 0;
+my $a = [];
 while ( my $rec = $sth->fetchrow_hashref ) {
-    if($i > 0){ print ","; }
-    print "{\"fieldvalue\":\"" . nsb_clean($rec->{$field}) . "\"" .
-          "}";
-    $i++;
+    push @$a, { fieldvalue => nsb_clean($rec->{$field}) };
 }
-print "]";
-
 
+print to_json($a);