inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
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
This commit is contained in:
Andrei Rebegea
2017-06-15 10:59:38 +00:00
parent ee012006ab
commit bc69676fd2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -323,7 +323,7 @@ public class ResultMapper
{ {
Object display = withDisplay?propertyLookup.lookup(facet.getKey(), buck.getFirst()):null; Object display = withDisplay?propertyLookup.lookup(facet.getKey(), buck.getFirst()):null;
String filterQuery = lookupQuery(facet.getKey(), buck.getFirst(), searchQuery); 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)); ffcs.add(new FacetFieldContext(facet.getKey(), buckets));
} }
@@ -341,13 +341,14 @@ public class ResultMapper
&& searchQuery.getFacetIntervals().getIntervals() != null && searchQuery.getFacetIntervals().getIntervals() != null
&& !searchQuery.getFacetIntervals().getIntervals().isEmpty()) && !searchQuery.getFacetIntervals().getIntervals().isEmpty())
{ {
Optional<Interval> found = searchQuery.getFacetIntervals().getIntervals().stream().filter(interval -> facetKey.equals(interval.getField())).findFirst(); Optional<Interval> found = searchQuery.getFacetIntervals().getIntervals().stream().filter(
interval -> facetKey.equals(interval.getLabel()!=null?interval.getLabel():interval.getField())).findFirst();
if (found.isPresent()) if (found.isPresent())
{ {
if (found.get().getSets() != null) if (found.get().getSets() != null)
{ {
Optional<IntervalSet> foundSet = found.get().getSets().stream().filter(aSet -> key.equals(aSet.getLabel())).findFirst(); Optional<IntervalSet> 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();
} }
} }
} }