use Koha::SearchMarcMaps;
use Carp;
+use Clone qw(clone);
use JSON;
use Modern::Perl;
use Readonly;
my $self = shift @_;
unless (defined $self->{elasticsearch}) {
my $conf = $self->get_elasticsearch_params();
- $self->{elasticsearch} = Search::Elasticsearch->new(
- client => "5_0::Direct",
- nodes => $conf->{nodes},
- cxn_pool => 'Sniff',
- request_timeout => 60
- );
+ $self->{elasticsearch} = Search::Elasticsearch->new($conf);
}
return $self->{elasticsearch};
}
else {
die "No elasticsearch servers were specified in koha-conf.xml.\n";
}
- die "No elasticserver index_name was specified in koha-conf.xml.\n"
+ die "No elasticsearch index_name was specified in koha-conf.xml.\n"
if ( !$es->{index_name} );
# Append the name of this particular index to our namespace
$es->{index_name} .= '_' . $self->index;
$es->{key_prefix} = 'es_';
+ $es->{client} //= '5_0::Direct';
+ $es->{cxn_pool} //= 'Sniff';
+ $es->{request_timeout} //= 60;
+
return $es;
}
if (!defined $all_mappings{$self->index}) {
$sort_fields{$self->index} = {};
+ # Clone the general mapping to break ties with the original hash
my $mappings = {
- data => scalar _get_elasticsearch_mapping('general', '')
+ data => clone(_get_elasticsearch_field_config('general', ''))
};
my $marcflavour = lc C4::Context->preference('marcflavour');
$self->_foreach_mapping(
sub {
my ( $name, $type, $facet, $suggestible, $sort, $marc_type ) = @_;
+
return if $marc_type ne $marcflavour;
# TODO if this gets any sort of complexity to it, it should
# be broken out into its own function.
$es_type = 'stdno';
}
- $mappings->{data}{properties}{$name} = _get_elasticsearch_mapping('search', $es_type);
+ $mappings->{data}{properties}{$name} = _get_elasticsearch_field_config('search', $es_type);
if ($facet) {
- $mappings->{data}{properties}{ $name . '__facet' } = _get_elasticsearch_mapping('facet', $es_type);
+ $mappings->{data}{properties}{ $name . '__facet' } = _get_elasticsearch_field_config('facet', $es_type);
}
if ($suggestible) {
- $mappings->{data}{properties}{ $name . '__suggestion' } = _get_elasticsearch_mapping('suggestible', $es_type);
+ $mappings->{data}{properties}{ $name . '__suggestion' } = _get_elasticsearch_field_config('suggestible', $es_type);
}
# Sort is a bit special as it can be true, false, undef.
# We care about "true" or "undef",
# "undef" means to do the default thing, which is make it sortable.
if (!defined $sort || $sort) {
- $mappings->{data}{properties}{ $name . '__sort' } = _get_elasticsearch_mapping('sort', $es_type);
+ $mappings->{data}{properties}{ $name . '__sort' } = _get_elasticsearch_field_config('sort', $es_type);
$sort_fields{$self->index}{$name} = 1;
}
}
return $all_mappings{$self->index};
}
-=head2 _get_elasticsearch_mapping
+=head2 _get_elasticsearch_field_config
-Get the Elasticsearch mappings for the given purpose and data type.
+Get the Elasticsearch field config for the given purpose and data type.
-$mapping = _get_elasticsearch_mapping('search', 'text');
+$mapping = _get_elasticsearch_field_config('search', 'text');
=cut
-sub _get_elasticsearch_mapping {
+sub _get_elasticsearch_field_config {
my ( $purpose, $type ) = @_;
my $field_type = $data->{type};
my $field_label = $data->{label};
my $mappings = $data->{mappings};
- my $search_field = Koha::SearchFields->find_or_create({ name => $field_name, label => $field_label, type => $field_type }, { key => 'name' });
+ my $facet_order = $data->{facet_order};
+ my $search_field = Koha::SearchFields->find_or_create({
+ name => $field_name,
+ label => $field_label,
+ type => $field_type,
+ },
+ {
+ key => 'name'
+ });
+ $search_field->update(
+ {
+ facet_order => $facet_order
+ }
+ );
for my $mapping ( @$mappings ) {
my $marc_field = Koha::SearchMarcMaps->find_or_create({ index_name => $index_name, marc_type => $mapping->{marc_type}, marc_field => $mapping->{marc_field} });
$search_field->add_to_search_marc_maps($marc_field, { facet => $mapping->{facet} || 0, suggestible => $mapping->{suggestible} || 0, sort => $mapping->{sort} } );
$options->{property} => $_data
}
}
- # For sort fields, index only a single field with concatenated values
- if ($sort && @{$record_document->{$target}}) {
- @{$record_document->{$target}}[0] .= " $_data";
- } else {
- push @{$record_document->{$target}}, $_data;
- }
+ push @{$record_document->{$target}}, $_data;
}
}
}
}
+ # Remove duplicate values and collapse sort fields
+ foreach my $field (keys %{$record_document}) {
+ if (ref($record_document->{$field}) eq 'ARRAY') {
+ @{$record_document->{$field}} = do {
+ my %seen;
+ grep { !$seen{ref($_) eq 'HASH' && defined $_->{input} ? $_->{input} : $_}++ } @{$record_document->{$field}};
+ };
+ if ($field =~ /__sort$/) {
+ # Make sure to keep the sort field length sensible. 255 was chosen as a nice round value.
+ $record_document->{$field} = [substr(join(' ', @{$record_document->{$field}}), 0, 255)];
+ }
+ }
+ }
+
# TODO: Perhaps should check if $records_document non empty, but really should never be the case
$record->encoding('UTF-8');
my @warnings;
where "<START>" and "<END>" are integers specifying a range that will be used
for extracting a substring from MARC data as Elasticsearch field target value.
-The first character position is "1", and the range is inclusive,
-so "1-3" means the first three characters of MARC data.
+The first character position is "0", and the range is inclusive,
+so "0-2" means the first three characters of MARC data.
If only "<START>" is provided only one character at position "<START>" will
be extracted.
my @mappings;
my $substr_args = undef;
- if ($range) {
+ if (defined $range) {
# TODO: use value_callback instead?
my ($start, $end) = map(int, split /-/, $range, 2);
$substr_args = [$start];
while ( my $search_field = $search_fields->next ) {
$sub->(
- $search_field->name,
+ # Force lower case on indexed field names for case insensitive
+ # field name searches
+ lc($search_field->name),
$search_field->type,
$search_field->get_column('facet'),
$search_field->get_column('suggestible'),
return $configuration;
}
+=head2 get_facetable_fields
+
+my @facetable_fields = Koha::SearchEngine::Elasticsearch->get_facetable_fields();
+
+Returns the list of Koha::SearchFields marked to be faceted in the ES configuration
+
+=cut
+
+sub get_facetable_fields {
+ my ($self) = @_;
+
+ # These should correspond to the ES field names, as opposed to the CCL
+ # things that zebra uses.
+ my @search_field_names = qw( author itype location su-geo title-series subject ccode holdingbranch homebranch ln );
+ my @faceted_fields = Koha::SearchFields->search(
+ { name => { -in => \@search_field_names }, facet_order => { '!=' => undef } }, { order_by => ['facet_order'] }
+ );
+ my @not_faceted_fields = Koha::SearchFields->search(
+ { name => { -in => \@search_field_names }, facet_order => undef }, { order_by => ['facet_order'] }
+ );
+ # This could certainly be improved
+ return ( @faceted_fields, @not_faceted_fields );
+}
+
1;
__END__
projects / koha-equinox.git / blobdiff