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

(-)a/Koha/SearchEngine/Elasticsearch.pm (-5 / +19 lines)
Lines 382-392 sub reset_elasticsearch_mappings { Link Here
382
        }
382
        }
383
    }
383
    }
384
384
385
    my $cache = Koha::Caches->get_instance();
385
    $self->clear_search_fields_cache();
386
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
387
    $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
388
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
389
    $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
390
386
391
    # FIXME return the mappings?
387
    # FIXME return the mappings?
392
}
388
}
Lines 1287-1292 sub get_facetable_fields { Link Here
1287
    return ( @faceted_fields, @not_faceted_fields );
1283
    return ( @faceted_fields, @not_faceted_fields );
1288
}
1284
}
1289
1285
1286
=head2 clear_search_fields_cache
1287
1288
Koha::SearchEngine::Elasticsearch->clear_search_fields_cache();
1289
1290
Clear cached values for ES search fields
1291
1292
=cut
1293
1294
sub clear_search_fields_cache {
1295
1296
    my $cache = Koha::Caches->get_instance();
1297
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
1298
    $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
1299
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
1300
    $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
1301
1302
}
1303
1290
1;
1304
1;
1291
1305
1292
__END__
1306
__END__
(-)a/admin/searchengine/elasticsearch/mappings.pl (-5 / +1 lines)
Lines 165-175 if ( $op eq 'edit' ) { Link Here
165
        push @messages, { type => 'message', code => 'success_on_update' };
165
        push @messages, { type => 'message', code => 'success_on_update' };
166
        $schema->storage->txn_commit;
166
        $schema->storage->txn_commit;
167
167
168
        my $cache = Koha::Caches->get_instance();
168
        Koha::SearchEngine::Elasticsearch->clear_search_fields_cache();
169
        $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
170
        $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
171
        $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
172
        $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
173
169
174
        $update_mappings->();
170
        $update_mappings->();
175
    }
171
    }
(-)a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t (-9 / +1 lines)
Lines 101-114 $se->mock( 'get_elasticsearch_mappings', sub { Link Here
101
    return $all_mappings{$self->index};
101
    return $all_mappings{$self->index};
102
});
102
});
103
103
104
my $cache = Koha::Caches->get_instance();
105
my $clear_search_fields_cache = sub {
106
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
107
    $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
108
    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
109
    $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
110
};
111
112
subtest 'build_authorities_query_compat() tests' => sub {
104
subtest 'build_authorities_query_compat() tests' => sub {
113
105
114
    plan tests => 57;
106
    plan tests => 57;
Lines 635-641 subtest 'build_query with weighted fields tests' => sub { Link Here
635
    $search_field->update({ weight => 25.0 });
627
    $search_field->update({ weight => 25.0 });
636
    $search_field = Koha::SearchFields->find({ name => 'subject' });
628
    $search_field = Koha::SearchFields->find({ name => 'subject' });
637
    $search_field->update({ weight => 15.5 });
629
    $search_field->update({ weight => 15.5 });
638
    $clear_search_fields_cache->();
630
    Koha::SearchEngine::Elasticsearch->clear_search_fields_cache();
639
631
640
    my ( undef, $query ) = $qb->build_query_compat( undef, ['title:"donald duck"'], undef, undef,
632
    my ( undef, $query ) = $qb->build_query_compat( undef, ['title:"donald duck"'], undef, undef,
641
    undef, undef, undef, { weighted_fields => 1 });
633
    undef, undef, undef, { weighted_fields => 1 });
(-)a/t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t (-6 / +1 lines)
Lines 72-79 is($title_sf->weight, '20.00', 'Title search field is weighted with 20'); Link Here
72
72
73
$schema->storage->txn_rollback;
73
$schema->storage->txn_rollback;
74
74
75
$cache = Koha::Caches->get_instance();
75
Koha::SearchEngine::Elasticsearch->clear_search_fields_cache();
76
$cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
77
$cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
78
$cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
79
$cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
80
- 

Return to bug 25278