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

(-)a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm (-2 / +7 lines)
Lines 44-49 use JSON; Link Here
44
use List::MoreUtils qw( each_array );
44
use List::MoreUtils qw( each_array );
45
use Modern::Perl;
45
use Modern::Perl;
46
use URI::Escape qw( uri_escape_utf8 );
46
use URI::Escape qw( uri_escape_utf8 );
47
use version;
47
48
48
use C4::Context;
49
use C4::Context;
49
use Koha::Exceptions;
50
use Koha::Exceptions;
Lines 639-649 sub _build_scan_query { Link Here
639
            query => '*'
640
            query => '*'
640
        }
641
        }
641
    };
642
    };
643
    my $es_key = '_key';
644
    my $elasticsearch = $self->get_elasticsearch();
645
    if (version->parse($elasticsearch->info->{version}->{number}) < version->parse('6.0.0')) {
646
        $es_key = '_term';
647
    }
642
    $res->{aggregations} = {
648
    $res->{aggregations} = {
643
        $index => {
649
        $index => {
644
            terms => {
650
            terms => {
645
                field => $index . '__facet',
651
                field => $index . '__facet',
646
                order => { '_term' => 'asc' },
652
                order => { $es_key => 'asc' },
647
                include => $self->_create_regex_filter($self->clean_search_term($term)) . '.*'
653
                include => $self->_create_regex_filter($self->clean_search_term($term)) . '.*'
648
            }
654
            }
649
        }
655
        }
650
- 

Return to bug 27770