X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=authorities%2Fysearch.pl;h=4a5ae796a76f0b3fe089efff8ee7616631e4b925;hb=6cd88847ae12f461ff134c3ee2a545e59bb7520b;hp=c9e7c47063dcec8470999caad2aa3f6a90a2301f;hpb=3aaaf2f2e4fa49d18b91d584d6b3ca48ff973317;p=koha.git

diff --git a/authorities/ysearch.pl b/authorities/ysearch.pl
index c9e7c47063..4a5ae796a7 100755
--- a/authorities/ysearch.pl
+++ b/authorities/ysearch.pl
@@ -7,18 +7,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
 
@@ -27,36 +27,34 @@ This script allows ajax call for dynamic authorities search
 
 =cut
 
-use CGI;
+use CGI qw ( -utf8 );
 use Modern::Perl;
+use JSON;
+
 use C4::Context;
 use C4::Charset;
 use C4::AuthoritiesMarc;
 use C4::Auth qw/check_cookie_auth/;
+use C4::Output;
 
 my $query = new CGI;
 
-binmode STDOUT, ':encoding(UTF-8)';
-print $query->header( -type => 'text/plain', -charset => 'UTF-8' );
+my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), { catalogue => 1 } );
 
-my ( $auth_status, $sessionID ) = check_cookie_auth( $query->cookie('CGISESSID'), { } );
 if ( $auth_status ne "ok" ) {
+    # send empty response
+    my $reply = CGI->new("");
+    print $reply->header(-type => 'text/html');
     exit 0;
 }
 
-    my $searchstr = $query->param('term');
+    my @value      = $query->multi_param('term');
     my $searchtype = $query->param('querytype');
-    my @value;
-    given ($searchtype) {
-        when (/^marclist$/)      { @value = (undef, undef, $searchstr); }
-        when (/^mainentry$/)     { @value = (undef, $searchstr, undef); }
-        when (/^mainmainentry$/) { @value = ($searchstr, undef, undef); }
-    }
     my @marclist  = ($searchtype);
     my $authtypecode = $query->param('authtypecode');
-    my @and_or    = $query->param('and_or');
-    my @excluding = $query->param('excluding');
-    my @operator  = $query->param('operator');
+    my @and_or    = $query->multi_param('and_or');
+    my @excluding = $query->multi_param('excluding');
+    my @operator  = $query->multi_param('operator');
     my $orderby   = $query->param('orderby');
 
     my $resultsperpage = 50;
@@ -64,17 +62,26 @@ if ( $auth_status ne "ok" ) {
 
     my ( $results, $total ) = SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, $startfrom * $resultsperpage, $resultsperpage, $authtypecode, $orderby );
 
-print "[";
-my $i = 0;
+    my %used_summaries; # hash to avoid duplicates
+    my @summaries;
     foreach my $result (@$results) {
-        if($i > 0){ print ","; }
-        my $value = '';
-        my $authorized = $result->{'summary'}->{authorized};
-        foreach my $heading (@$authorized) {
-            $value .= $heading . ' ';
+        my $authorized = $result->{'summary'}->{'authorized'};
+        my $summary    = join(
+            ' ',
+            map {
+                ( $searchtype eq 'mainmainentry' )
+                  ? $_->{'hemain'}
+                  : $_->{'heading'}
+              } @$authorized
+        );
+        $summary =~ s/^\s+//;
+        $summary =~ s/\s+$//;
+        $summary = nsb_clean($summary);
+        # test if already added ignoring case
+        unless ( exists $used_summaries{ lc($summary) } ) {
+            push @summaries, { 'summary' => $summary };
+            $used_summaries{ lc($summary) } = 1;
         }
-        $value = "{\"summary\":\"" . $value . "\"" . "}";
-        print nsb_clean($value) . "\n";
-        $i++;
     }
-print "]";
+
+output_with_http_headers $query, undef, to_json(\@summaries, { utf8 => 1 }), 'json';