From 474b9a1672b3b62d8c24fe72127bdadd1a11ff3f Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Mon, 21 May 2018 14:24:36 +0200 Subject: [PATCH] Bug 18316: Change search field weight field to decimal Signed-off-by: Ere Maijala Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- admin/searchengine/elasticsearch/mappings.pl | 3 ++- .../atomicupdate/bug_18316_add-weight-column.perl | 4 ++-- installer/data/mysql/kohastructure.sql | 2 +- .../admin/searchengine/elasticsearch/mappings.tt | 14 +++++--------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl index 6760002a94..8650201d87 100755 --- a/admin/searchengine/elasticsearch/mappings.pl +++ b/admin/searchengine/elasticsearch/mappings.pl @@ -17,6 +17,7 @@ use Modern::Perl; use CGI; +use Scalar::Util qw(looks_like_number); use C4::Koha; use C4::Output; use C4::Auth; @@ -71,7 +72,7 @@ if ( $op eq 'edit' ) { my $search_field = Koha::SearchFields->find( { name => $field_name }, { key => 'name' } ); $search_field->label($field_label); $search_field->type($field_type); - $search_field->weight($field_weight || ''); + $search_field->weight($field_weight) if looks_like_number($field_weight) && $field_weight > 0; $search_field->store; } diff --git a/installer/data/mysql/atomicupdate/bug_18316_add-weight-column.perl b/installer/data/mysql/atomicupdate/bug_18316_add-weight-column.perl index 185a2b5565..a076d8b402 100644 --- a/installer/data/mysql/atomicupdate/bug_18316_add-weight-column.perl +++ b/installer/data/mysql/atomicupdate/bug_18316_add-weight-column.perl @@ -1,9 +1,9 @@ $DBversion = 'XXX'; if( CheckVersion( $DBversion ) ) { if( !column_exists( 'search_field', 'weight' ) ) { - $dbh->do( "ALTER TABLE search_field ADD COLUMN weight int" ); + $dbh->do( "ALTER TABLE `search_field` ADD COLUMN `weight` decimal(5,2) DEFAULT NULL" ); } SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 18316 - Add column search_field.weight)\n"; -} \ No newline at end of file +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 17d29e1ed3..44cb92a257 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1474,7 +1474,7 @@ CREATE TABLE `search_field` ( `name` varchar(255) NOT NULL COMMENT 'the name of the field as it will be stored in the search engine', `label` varchar(255) NOT NULL COMMENT 'the human readable name of the field, for display', `type` ENUM('', 'string', 'date', 'number', 'boolean', 'sum', 'isbn', 'stdno') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine', - `weight` int default NULL, + `weight` decimal(5,2) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY (`name` (191)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index 816597630f..bb758bdb19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -93,7 +93,7 @@ a.add, a.delete {
Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly. -

Weight: define weight between 1 and 99. Higher numbers indicate increased relevancy. +

Weight: define weight as a positive number. Higher numbers indicate increased relevancy. Note that fields weighting works only for simple search.

  1. only search fields mapped with biblios can be weighted
  2. @@ -198,17 +198,13 @@ a.add, a.delete { [% END %] + [% IF search_field.mapped_biblios %] - - [% IF search_field.weight %] - - [% ELSE %] - - [% END %] - + [% ELSE %] - + [% END %] + [% END %] -- 2.39.5