From 0f7d6c5fd81b899f23c870ccc479dcadf529cf75 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 13 Sep 2019 17:18:35 -0400
Subject: [PATCH] explicit facet field, facet repairs

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/eg2/src/app/share/catalog/elastic.service.ts       | 4 ++--
 Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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 8df8f56877..e711ae7d0f 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
@@ -64,7 +64,7 @@ export class ElasticService {
         // Extract just the bits that get sent to ES.
         const elasticStruct: Object = requestBody.toJSON();
 
-        console.log(JSON.stringify(elasticStruct));
+        console.debug(JSON.stringify(elasticStruct));
 
         const options: any = {search_org: ctx.searchOrg.id()};
         if (ctx.global) {
@@ -137,7 +137,7 @@ export class ElasticService {
         ts.facetFilters.forEach(f => {
             if (f.facetValue !== '') {
                 rootNode.filter(new TermQuery(
-                    `${f.facetClass}|${f.facetName}`, f.facetValue));
+                    `${f.facetClass}|${f.facetName}.facet`, f.facetValue));
             }
         });
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
index 90de6fb75d..178b3d884d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
@@ -261,7 +261,7 @@ sub add_elastic_facet_aggregations {
         my $fgrp = $facet->search_group;
         $fname = "$fgrp|$fname" if $fgrp;
 
-        $elastic_query->{aggs}{$fname} = {terms => {field => $fname}};
+        $elastic_query->{aggs}{$fname} = {terms => {field => "$fname.facet"}};
     }
 }
 
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 b110a8145b..d3cdf49e88 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Elastic/Bib/Search.pm
@@ -235,7 +235,7 @@ sub create_index {
         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'};
+            $def->{fields}->{facet} = {type => 'keyword'};
         }
 
         $logger->debug("ES adding field $field_name: ". 
-- 
2.11.0