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

(-)a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm (+1 lines)
Lines 435-440 sub build_authorities_query_compat { Link Here
435
            unless exists $koha_to_index_name->{$m};
435
            unless exists $koha_to_index_name->{$m};
436
    }
436
    }
437
    for ( my $i = 0 ; $i < @$value ; $i++ ) {
437
    for ( my $i = 0 ; $i < @$value ; $i++ ) {
438
        next unless $value->[$i]; #clean empty form values, ES doesn't like undefined searches
438
        push @searches,
439
        push @searches,
439
          {
440
          {
440
            where    => $koha_to_index_name->{$marclist->[$i]},
441
            where    => $koha_to_index_name->{$marclist->[$i]},
(-)a/authorities/auth_finder.pl (-3 / +13 lines)
Lines 28-33 use C4::Context; Link Here
28
use C4::AuthoritiesMarc;
28
use C4::AuthoritiesMarc;
29
use C4::Acquisition;
29
use C4::Acquisition;
30
use C4::Koha;
30
use C4::Koha;
31
use Koha::SearchEngine::Search;
32
use Koha::SearchEngine::QueryBuilder;
31
33
32
use Koha::Authority::Types;
34
use Koha::Authority::Types;
33
35
Lines 69-78 if ( $op eq "do_search" ) { Link Here
69
    my $startfrom      = $query->param('startfrom')      || 0;
71
    my $startfrom      = $query->param('startfrom')      || 0;
70
    my $resultsperpage = $query->param('resultsperpage') || 20;
72
    my $resultsperpage = $query->param('resultsperpage') || 20;
71
73
74
    my $builder = Koha::SearchEngine::QueryBuilder->new(
75
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
76
    my $searcher = Koha::SearchEngine::Search->new(
77
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
78
    my $search_query = $builder->build_authorities_query_compat(
79
        \@marclist, \@and_or, \@excluding, \@operator,
80
        \@value, $authtypecode, $orderby
81
    );
82
    my $offset = $startfrom * $resultsperpage;
72
    my ( $results, $total ) =
83
    my ( $results, $total ) =
73
      SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value,
84
        $searcher->search_auth_compat( $search_query, $offset,
74
        $startfrom * $resultsperpage,
85
        $resultsperpage );
75
        $resultsperpage, $authtypecode, $orderby );
76
86
77
    # multi page display gestion
87
    # multi page display gestion
78
    my $displaynext = 0;
88
    my $displaynext = 0;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc (-2 / +1 lines)
Lines 197-203 function finderjumpfull(page) Link Here
197
                </li>
197
                </li>
198
                <li>
198
                <li>
199
                    <label for="marclistanywhere">Search entire record: </label>
199
                    <label for="marclistanywhere">Search entire record: </label>
200
                    <input type="hidden" name="marclist" value="any" />
200
                    <input type="hidden" name="marclist" value="all" />
201
                    <input type="hidden" name="and_or" value="and" />
201
                    <input type="hidden" name="and_or" value="and" />
202
                    <input type="hidden" name="excluding" value="" />
202
                    <input type="hidden" name="excluding" value="" />
203
                    <select name="operator" id="marclistanywhere">
203
                    <select name="operator" id="marclistanywhere">
204
- 

Return to bug 19582