From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 13 Sep 2019 17:13:30 +0000 (-0400)
Subject: leverage copy_to for grouped fields
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7a7491dd038b2b9cf9b7a6961c0d21ca53ca2c9d;p=working%2FEvergreen.git

leverage copy_to for grouped fields

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/eg2/src/app/share/catalog/elastic.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/elastic.service.ts
index 7f62c83f3e..f956ca2f19 100644
--- a/Open-ILS/src/eg2/src/app/share/catalog/elastic.service.ts
+++ b/Open-ILS/src/eg2/src/app/share/catalog/elastic.service.ts
@@ -243,7 +243,7 @@ export class ElasticService {
 
         const matchOp = ts.matchOp[idx];
         const fieldClass = ts.fieldClass[idx];
-        const textIndex = `${fieldClass}|*.text*`;
+        const textIndex = `${fieldClass}.text*`;
         let query;
 
         switch (matchOp) {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm
index 7dfcebf65a..c36e9e97b5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm
@@ -18,6 +18,7 @@ use warnings;
 use Encode;
 use DateTime;
 use Time::HiRes qw/time/;
+use Clone 'clone';
 use Business::ISBN;
 use Business::ISSN;
 use OpenSRF::Utils::Logger qw/:logger/;
@@ -88,6 +89,58 @@ my $BASE_PROPERTIES = {
                 }
             }
         }
+    },
+
+    # Make it possible to search across all fields in a search group.
+    # Values from grouped fields are copied into the group field.
+    # Here we make some assumptions about the general purpose of
+    # each group.
+    title => {
+        type => 'keyword',
+        normalizer => 'custom_lowercase',
+        fields => {
+            text => {type => 'text'},
+            text_folded => {type => 'text', analyzer => 'folding'}
+        }
+    },
+    author => {
+        type => 'keyword',
+        normalizer => 'custom_lowercase',
+        fields => {
+            text => {type => 'text'},
+            text_folded => {type => 'text', analyzer => 'folding'}
+        }
+    },
+    subject => {
+        type => 'keyword',
+        normalizer => 'custom_lowercase',
+        fields => {
+            text => {type => 'text'},
+            text_folded => {type => 'text', analyzer => 'folding'}
+        }
+    },
+    series => {
+        type => 'keyword',
+        normalizer => 'custom_lowercase',
+        fields => {
+            text => {type => 'text'},
+            text_folded => {type => 'text', analyzer => 'folding'}
+        }
+    },
+    keyword => {
+        # term (aka "keyword") searches are not used on the 
+        # keyword field, but we index it just the same (sans lowercase) 
+        # for structural consistency with other group fields.
+        type => 'keyword',
+        fields => {
+            text => {type => 'text'},
+            text_folded => {type => 'text', analyzer => 'folding'}
+        }
+    },
+    identifier => {
+        # Avoid full-text indexing on identifier fields.
+        type => 'keyword',
+        normalizer => 'custom_lowercase',
     }
 };
 
@@ -119,6 +172,14 @@ sub create_index {
             type => 'text',
             analyzer => $lang_analyzer
         };
+
+        # Apply language analysis to grouped fields, however skip
+        # the 'author' and 'identifier' groups since it makes less sense to 
+        # language-analyze proper names and identifiers.
+        $mappings->{$_}->{fields}->{"text_$lang_analyzer"} = {
+            type => 'text',
+            analyzer => $lang_analyzer
+        } foreach qw/title subject series keyword/;
     }
 
     my $fields = new_editor()->retrieve_all_elastic_bib_field();
@@ -129,45 +190,36 @@ sub create_index {
         my $search_group = $field->search_group;
         $field_name = "$search_group|$field_name" if $search_group;
 
-        # Every field gets a lowercase keyword index for term 
-        # searches/filters and sorting.
-        my $def = {
-            type => 'keyword',
-            normalizer => 'custom_lowercase'
-        };
+        my $def;
 
-        my $fields = {};
+        if ($search_group) {
 
-        if ($field->facet_field eq 't') {
-            # Facet fields are used for aggregation which requires
-            # an unaltered keyword field.
-            $fields->{raw} = {type => 'keyword'};
-        }
+            # Use the same fields and analysis as the 'grouped' field.
+            $def = clone($mappings->{$search_group});
+            $def->{copy_to} = $search_group if $search_group;
 
-        if ($field->search_field eq 't') {
-            # Text search fields get an additional variety of indexes to
-            # support full text searching
-        
-            $fields->{text} = {type => 'text'},
-            $fields->{text_folded} = {type => 'text', analyzer => 'folding'};
-
-            # Add the language analyzers
-            for my $lang_analyzer ($self->language_analyzers) {
-                $fields->{"text_$lang_analyzer"} = {
-                    type => 'text',
-                    analyzer => $lang_analyzer
-                };
+            # Apply ranking boost to each analysis variation.
+            my $flds = $def->{fields};
+            if ($flds && (my $boost = ($field->weight || 1)) > 1) {
+                $flds->{$_}->{boost} = $boost foreach keys %$flds;
             }
 
-            if ((my $boost = ($field->weight || 1)) > 1) {
-                $fields->{text}->{boost} = $boost;
-                $fields->{text_folded}->{boost} = $boost;
-                $fields->{"text_$_"}->{boost} = $boost 
-                    foreach $self->language_analyzers;
-            }
+        } else {
+
+            # Non-grouped fields are used for filtering and sorting, so
+            # they don't need as much processing.
+
+            $def = {
+                type => 'keyword',
+                normalizer => 'custom_lowercase'
+            };
         }
 
-        $def->{fields} = $fields if keys %$fields;
+        if ($field->facet_field eq 't' && $def->{fields}) {
+            # Facet fields are used for aggregation which requires
+            # an additional unaltered keyword field.
+            $def->{fields}->{raw} = {type => 'keyword'};
+        }
 
         $logger->debug("ES adding field $field_name: ". 
             OpenSRF::Utils::JSON->perl2JSON($def));