Attachment #74998 for bug #20273

View | Details | Raw Unified | Return to bug 20273
Collapse All | Expand All

Lines 42-47 use Modern::Perl; Link Here

(-)a/Koha/SearchEngine/Elasticsearch/Search.pm (+1 lines)
42		42
43	use base qw(Koha::SearchEngine::Elasticsearch);	43	use base qw(Koha::SearchEngine::Elasticsearch);
44	use C4::Context;	44	use C4::Context;
		45	use C4::AuthoritiesMarc;
45	use Koha::ItemTypes;	46	use Koha::ItemTypes;
46	use Koha::AuthorisedValues;	47	use Koha::AuthorisedValues;
47	use Koha::SearchEngine::QueryBuilder;	48	use Koha::SearchEngine::QueryBuilder;





use C4::Context;
use C4::Charset;
use C4::AuthoritiesMarc;
use C4::Auth qw/check_cookie_auth/;
use C4::Output;
use Koha::SearchEngine::Search;
use Koha::SearchEngine::QueryBuilder;

my $query = new CGI;


    my $resultsperpage = 50;
    my $startfrom = 0;

    my $builder = Koha::SearchEngine::QueryBuilder->new(
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
    my $searcher = Koha::SearchEngine::Search->new(
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
    my $search_query = $builder->build_authorities_query_compat(
        \@marclist, \@and_or, \@excluding, \@operator,
        \@value, $authtypecode, $orderby
    );
    my $offset = $startfrom * $resultsperpage;
    my ( $results, $total ) =
        $searcher->search_auth_compat( $search_query, $offset,
        $resultsperpage );

    my %used_summaries; # hash to avoid duplicates
    my @summaries;

Lines 23-29 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js (-2 / +1 lines)
23	and_or: "and",	23	and_or: "and",
24	operator: "contains",	24	operator: "contains",
25	orderby: "HeadingAsc",	25	orderby: "HeadingAsc",
26	querytype: "marclist"	26	querytype: "all"
27	},	27	},
28	success: function(data) {	28	success: function(data) {
29	response( $.map( data, function( item ) {	29	response( $.map( data, function( item ) {
30	-

Return to bug 20273

Lines 33-41 use JSON; Link Here

(-)a/authorities/ysearch.pl (-2 / +14 lines)
33		33
34	use C4::Context;	34	use C4::Context;
35	use C4::Charset;	35	use C4::Charset;
36	use C4::AuthoritiesMarc;
37	use C4::Auth qw/check_cookie_auth/;	36	use C4::Auth qw/check_cookie_auth/;
38	use C4::Output;	37	use C4::Output;
		38	use Koha::SearchEngine::Search;
		39	use Koha::SearchEngine::QueryBuilder;
39		40
40	my $query = new CGI;	41	my $query = new CGI;
41		42
Lines 60-66 if ( $auth_status ne "ok" ) { Link Here
60	my $resultsperpage = 50;	61	my $resultsperpage = 50;
61	my $startfrom = 0;	62	my $startfrom = 0;
62		63
63	my ( $results, $total ) = SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, $startfrom * $resultsperpage, $resultsperpage, $authtypecode, $orderby );	64	my $builder = Koha::SearchEngine::QueryBuilder->new(
		65	{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
		66	my $searcher = Koha::SearchEngine::Search->new(
		67	{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
		68	my $search_query = $builder->build_authorities_query_compat(
		69	\@marclist, \@and_or, \@excluding, \@operator,
		70	\@value, $authtypecode, $orderby
		71	);
		72	my $offset = $startfrom * $resultsperpage;
		73	my ( $results, $total ) =
		74	$searcher->search_auth_compat( $search_query, $offset,
		75	$resultsperpage );
64		76
65	my %used_summaries; # hash to avoid duplicates	77	my %used_summaries; # hash to avoid duplicates
66	my @summaries;	78	my @summaries;