Bug 12478: pull the SQL updates from the browse interface

Hopefully will reduce the rate of conflicts down the road. We'll see.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
This commit is contained in:
Robin Sheat 2015-08-27 16:13:16 +12:00 committed by Brendan Gallagher
parent 364b5870ed
commit e0be1ee6dc
1 changed files with 21 additions and 4 deletions

View File

@ -1,6 +1,6 @@
package Koha::ElasticSearch;
# Copyright 2013 Catalyst IT
# Copyright 2015 Catalyst IT
#
# This file is part of Koha.
#
@ -177,7 +177,7 @@ sub get_elasticsearch_mappings {
my $marcflavour = lc C4::Context->preference('marcflavour');
$self->_foreach_mapping(
sub {
my ( $name, $type, $facet, $marc_type ) = @_;
my ( $name, $type, $facet, $suggestible, $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.
@ -199,6 +199,10 @@ sub get_elasticsearch_mappings {
type => "string",
copy_to => "_all.phrase",
},
raw => {
"type" => "string",
"index" => "not_analyzed",
}
},
};
$mappings->{data}{properties}{$name}{null_value} = 0
@ -209,6 +213,13 @@ sub get_elasticsearch_mappings {
index => "not_analyzed",
};
}
if ($suggestible) {
$mappings->{data}{properties}{ $name . '__suggestion' } = {
type => 'completion',
index_analyzer => 'simple',
search_analyzer => 'simple',
};
}
}
);
return $mappings;
@ -222,7 +233,7 @@ sub get_fixer_rules {
my @rules;
$self->_foreach_mapping(
sub {
my ( $name, $type, $facet, $marc_type, $marc_field ) = @_;
my ( $name, $type, $facet, $suggestible, $marc_type, $marc_field ) = @_;
return if $marc_type ne $marcflavour;
my $options = '';
@ -235,6 +246,10 @@ sub get_fixer_rules {
if ($facet) {
push @rules, "marc_map('$marc_field','${name}__facet', $options)";
}
if ($suggestible) {
push @rules,
"marc_map('$marc_field','${name}__suggestion.input.\$append', $options)";
}
if ( $type eq 'boolean' ) {
# boolean gets special handling, basically if it doesn't exist,
@ -254,7 +269,7 @@ sub get_fixer_rules {
$self->_foreach_mapping(
sub {
my ( $name, $type, $facet, $marc_type, $marc_field ) = @_;
my ( $name, $type, $facet, $suggestible, $marc_type, $marc_field ) = @_;
return unless $marc_type eq 'marc21';
print "Data comes from: " . $marc_field . "\n";
}
@ -308,12 +323,14 @@ sub _foreach_mapping {
my $marc_type = $row->marc_type;
my $marc_field = $row->marc_field;
my $facet = $row->facet;
my $suggestible = $row->suggestible;
my $search_field = $row->search_fields();
for my $sf ( $search_field->all ) {
$sub->(
$sf->name,
$sf->type,
$facet,
$suggestible,
$marc_type,
$marc_field,
);