From bc69676fd2ba778eb9b1d16ba94f5c8bc6ceb742 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 10:59:38 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 136089 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1) 135623 gjames: SEARCH-339: Correct use of the interval field git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/search/impl/ResultMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java index b1b97fd8bc..aaf043e8a9 100644 --- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java @@ -323,7 +323,7 @@ public class ResultMapper { Object display = withDisplay?propertyLookup.lookup(facet.getKey(), buck.getFirst()):null; String filterQuery = lookupQuery(facet.getKey(), buck.getFirst(), searchQuery); - buckets.add(new Bucket(buck.getFirst(), facet.getKey()+":"+filterQuery, buck.getSecond(), display)); + buckets.add(new Bucket(buck.getFirst(), filterQuery, buck.getSecond(), display)); } ffcs.add(new FacetFieldContext(facet.getKey(), buckets)); } @@ -341,13 +341,14 @@ public class ResultMapper && searchQuery.getFacetIntervals().getIntervals() != null && !searchQuery.getFacetIntervals().getIntervals().isEmpty()) { - Optional found = searchQuery.getFacetIntervals().getIntervals().stream().filter(interval -> facetKey.equals(interval.getField())).findFirst(); + Optional found = searchQuery.getFacetIntervals().getIntervals().stream().filter( + interval -> facetKey.equals(interval.getLabel()!=null?interval.getLabel():interval.getField())).findFirst(); if (found.isPresent()) { if (found.get().getSets() != null) { Optional foundSet = found.get().getSets().stream().filter(aSet -> key.equals(aSet.getLabel())).findFirst(); - if (foundSet.isPresent()) return foundSet.get().toRange(); + if (foundSet.isPresent()) return found.get().getField()+":"+foundSet.get().toRange(); } } }