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

(-)a/C4/Matcher.pm (-2 / +2 lines)
Lines 703-710 sub get_matches { Link Here
703
                push @operator, 'exact';
703
                push @operator, 'exact';
704
                push @value,    $key;
704
                push @value,    $key;
705
            }
705
            }
706
            my $builder  = Koha::SearchEngine::QueryBuilder->new({index => $Koha::SearchEngine::AUTHORITIES_INDEX});
706
            my $builder  = Koha::SearchEngine::QueryBuilder->new({index => Koha::SearchEngine::AUTHORITIES_INDEX});
707
            my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::AUTHORITIES_INDEX});
707
            my $searcher = Koha::SearchEngine::Search->new({index => Koha::SearchEngine::AUTHORITIES_INDEX});
708
            my $search_query = $builder->build_authorities_query_compat(
708
            my $search_query = $builder->build_authorities_query_compat(
709
                \@marclist, \@and_or, \@excluding, \@operator,
709
                \@marclist, \@and_or, \@excluding, \@operator,
710
                \@value, undef, 'AuthidAsc'
710
                \@value, undef, 'AuthidAsc'
(-)a/Koha/Authorities.pm (-3 / +3 lines)
Lines 22-29 use Modern::Perl; Link Here
22
use Carp;
22
use Carp;
23
23
24
use Koha::Database;
24
use Koha::Database;
25
26
use Koha::Authority;
25
use Koha::Authority;
26
use Koha::SearchEngine;
27
27
28
use base qw(Koha::Objects);
28
use base qw(Koha::Objects);
29
29
Lines 51-57 sub get_usage_count { Link Here
51
    my ( $class, $params ) = @_;
51
    my ( $class, $params ) = @_;
52
    my $authid = $params->{authid} || return;
52
    my $authid = $params->{authid} || return;
53
53
54
    my $searcher = Koha::SearchEngine::Search->new({ index => $Koha::SearchEngine::BIBLIOS_INDEX });
54
    my $searcher = Koha::SearchEngine::Search->new({ index => Koha::SearchEngine::BIBLIOS_INDEX });
55
    my ( $err, $result, $count ) = $searcher->simple_search_compat( 'an:' . $authid, 0, 0 );
55
    my ( $err, $result, $count ) = $searcher->simple_search_compat( 'an:' . $authid, 0, 0 );
56
    if( $err ) {
56
    if( $err ) {
57
        warn "Error: $err from search for " . $authid;
57
        warn "Error: $err from search for " . $authid;
Lines 77-83 sub linked_biblionumbers { Link Here
77
    my ( $self, $params ) = @_;
77
    my ( $self, $params ) = @_;
78
    my $authid = $params->{authid} || return;
78
    my $authid = $params->{authid} || return;
79
79
80
    my $searcher = Koha::SearchEngine::Search->new({ index => $Koha::SearchEngine::BIBLIOS_INDEX });
80
    my $searcher = Koha::SearchEngine::Search->new({ index => Koha::SearchEngine::BIBLIOS_INDEX });
81
    # if max_results is undefined, we will get all results
81
    # if max_results is undefined, we will get all results
82
    my ( $err, $result, $count ) = $searcher->simple_search_compat( 'an:' . $authid, $params->{offset} // 0, $params->{max_results} );
82
    my ( $err, $result, $count ) = $searcher->simple_search_compat( 'an:' . $authid, $params->{offset} // 0, $params->{max_results} );
83
83
(-)a/Koha/SearchEngine/Elasticsearch.pm (-6 lines)
Lines 38-49 use Data::Dumper; # TODO remove Link Here
38
__PACKAGE__->mk_ro_accessors(qw( index ));
38
__PACKAGE__->mk_ro_accessors(qw( index ));
39
__PACKAGE__->mk_accessors(qw( sort_fields ));
39
__PACKAGE__->mk_accessors(qw( sort_fields ));
40
40
41
# Constants to refer to the standard index names
42
use constant {
43
    BIBLIOS_INDEX     => 'biblios',
44
    AUTHORITIES_INDEX => 'authorities',
45
};
46
47
=head1 NAME
41
=head1 NAME
48
42
49
Koha::SearchEngine::Elasticsearch - Base module for things using elasticsearch
43
Koha::SearchEngine::Elasticsearch - Base module for things using elasticsearch
(-)a/about.pl (-2 / +3 lines)
Lines 42-47 use Koha::Patrons; Link Here
42
use Koha::Caches;
42
use Koha::Caches;
43
use Koha::Config::SysPrefs;
43
use Koha::Config::SysPrefs;
44
use Koha::Illrequest::Config;
44
use Koha::Illrequest::Config;
45
use Koha::SearchEngine;
45
use Koha::SearchEngine::Elasticsearch;
46
use Koha::SearchEngine::Elasticsearch;
46
47
47
use C4::Members::Statistics;
48
use C4::Members::Statistics;
Lines 316-323 if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) { Link Here
316
    };
317
    };
317
    if ( !$es_config_error ) {
318
    if ( !$es_config_error ) {
318
319
319
        my $biblios_index_name     = $es_conf->{index_name} . "_" . $Koha::SearchEngine::BIBLIOS_INDEX;
320
        my $biblios_index_name     = $es_conf->{index_name} . "_" . Koha::SearchEngine::BIBLIOS_INDEX;
320
        my $authorities_index_name = $es_conf->{index_name} . "_" . $Koha::SearchEngine::AUTHORITIES_INDEX;
321
        my $authorities_index_name = $es_conf->{index_name} . "_" . Koha::SearchEngine::AUTHORITIES_INDEX;
321
322
322
        my @indexes = ($biblios_index_name, $authorities_index_name);
323
        my @indexes = ($biblios_index_name, $authorities_index_name);
323
        # TODO: When new indexes get added, we could have other ways to
324
        # TODO: When new indexes get added, we could have other ways to
(-)a/authorities/auth_finder.pl (-2 / +3 lines)
Lines 27-32 use C4::Auth; Link Here
27
use C4::Context;
27
use C4::Context;
28
use C4::Acquisition;
28
use C4::Acquisition;
29
use C4::Koha;
29
use C4::Koha;
30
use Koha::SearchEngine;
30
use Koha::SearchEngine::Search;
31
use Koha::SearchEngine::Search;
31
use Koha::SearchEngine::QueryBuilder;
32
use Koha::SearchEngine::QueryBuilder;
32
33
Lines 71-79 if ( $op eq "do_search" ) { Link Here
71
    my $resultsperpage = $query->param('resultsperpage') || 20;
72
    my $resultsperpage = $query->param('resultsperpage') || 20;
72
73
73
    my $builder = Koha::SearchEngine::QueryBuilder->new(
74
    my $builder = Koha::SearchEngine::QueryBuilder->new(
74
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
75
        { index => Koha::SearchEngine::AUTHORITIES_INDEX } );
75
    my $searcher = Koha::SearchEngine::Search->new(
76
    my $searcher = Koha::SearchEngine::Search->new(
76
        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
77
        { index => Koha::SearchEngine::AUTHORITIES_INDEX } );
77
    my $search_query = $builder->build_authorities_query_compat(
78
    my $search_query = $builder->build_authorities_query_compat(
78
        \@marclist, \@and_or, \@excluding, \@operator,
79
        \@marclist, \@and_or, \@excluding, \@operator,
79
        \@value, $authtypecode, $orderby
80
        \@value, $authtypecode, $orderby
(-)a/authorities/authorities-home.pl (+1 lines)
Lines 34-39 use C4::Biblio; Link Here
34
use C4::Search::History;
34
use C4::Search::History;
35
35
36
use Koha::Authority::Types;
36
use Koha::Authority::Types;
37
use Koha::SearchEngine;
37
use Koha::SearchEngine::Search;
38
use Koha::SearchEngine::Search;
38
use Koha::SearchEngine::QueryBuilder;
39
use Koha::SearchEngine::QueryBuilder;
39
use Koha::Token;
40
use Koha::Token;
(-)a/catalogue/search.pl (+1 lines)
Lines 152-157 use C4::Search::History; Link Here
152
use Koha::ItemTypes;
152
use Koha::ItemTypes;
153
use Koha::Library::Groups;
153
use Koha::Library::Groups;
154
use Koha::Patrons;
154
use Koha::Patrons;
155
use Koha::SearchEngine;
155
use Koha::SearchEngine::Search;
156
use Koha::SearchEngine::Search;
156
use Koha::SearchEngine::QueryBuilder;
157
use Koha::SearchEngine::QueryBuilder;
157
use Koha::Virtualshelves;
158
use Koha::Virtualshelves;
(-)a/cataloguing/addbooks.pl (+1 lines)
Lines 35-40 use C4::Koha; Link Here
35
use C4::Search;
35
use C4::Search;
36
36
37
use Koha::BiblioFrameworks;
37
use Koha::BiblioFrameworks;
38
use Koha::SearchEngine;
38
use Koha::SearchEngine::Search;
39
use Koha::SearchEngine::Search;
39
use Koha::SearchEngine::QueryBuilder;
40
use Koha::SearchEngine::QueryBuilder;
40
41
(-)a/misc/search_tools/rebuild_elastic_search.pl (-2 / +3 lines)
Lines 86-91 use Getopt::Long; Link Here
86
use C4::Context;
86
use C4::Context;
87
use Koha::MetadataRecord::Authority;
87
use Koha::MetadataRecord::Authority;
88
use Koha::BiblioUtils;
88
use Koha::BiblioUtils;
89
use Koha::SearchEngine;
89
use Koha::SearchEngine::Elasticsearch::Indexer;
90
use Koha::SearchEngine::Elasticsearch::Indexer;
90
use MARC::Field;
91
use MARC::Field;
91
use MARC::Record;
92
use MARC::Record;
Lines 136-142 if ($index_biblios) { Link Here
136
            $records->next();
137
            $records->next();
137
        }
138
        }
138
    }
139
    }
139
    do_reindex($next, Koha::SearchEngine::Elasticsearch::BIBLIOS_INDEX);
140
    do_reindex($next, Koha::SearchEngine::BIBLIOS_INDEX);
140
}
141
}
141
if ($index_authorities) {
142
if ($index_authorities) {
142
    _log(1, "Indexing authorities\n");
143
    _log(1, "Indexing authorities\n");
Lines 153-159 if ($index_authorities) { Link Here
153
            $records->next();
154
            $records->next();
154
        }
155
        }
155
    }
156
    }
156
    do_reindex($next, Koha::SearchEngine::Elasticsearch::AUTHORITIES_INDEX);
157
    do_reindex($next, Koha::SearchEngine::AUTHORITIES_INDEX);
157
}
158
}
158
159
159
sub do_reindex {
160
sub do_reindex {
(-)a/opac/opac-authorities-home.pl (-1 / +1 lines)
Lines 33-38 use C4::Koha; Link Here
33
use C4::Search::History;
33
use C4::Search::History;
34
34
35
use Koha::Authority::Types;
35
use Koha::Authority::Types;
36
use Koha::SearchEngine;
36
use Koha::SearchEngine::Search;
37
use Koha::SearchEngine::Search;
37
use Koha::SearchEngine::QueryBuilder;
38
use Koha::SearchEngine::QueryBuilder;
38
39
39
- 

Return to bug 16588