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 searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
136973 msuzuki: Search-426, update mapper to handle facet fields to accept facetFormat


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:13:06 +00:00
parent 9a9db208a4
commit d1af5d89b8
2 changed files with 52 additions and 4 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

@@ -76,6 +76,7 @@ import org.alfresco.rest.framework.resource.parameters.Params;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.FacetFormat;
import org.alfresco.service.cmr.search.Interval;
import org.alfresco.service.cmr.search.IntervalSet;
import org.alfresco.service.cmr.search.ResultSet;
@@ -303,7 +304,7 @@ public class ResultMapper
{
//If group by field populated in query facet return bucketing into facet field.
List<GenericFacetResponse> facetQueryForFields = getFacetBucketsFromFacetQueries(facetQueries,searchQuery);
if(!facetQueryForFields.isEmpty())
if(!facetQueryForFields.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
{
facets.addAll(facetQueryForFields);
}
@@ -383,7 +384,7 @@ public class ResultMapper
group = found.get().getGroup();
}
}
if(group != null && !group.isEmpty())
if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
{
if(groups.containsKey(group))
{
@@ -487,8 +488,6 @@ public class ResultMapper
}
}
}
// Set<Metric> metrics = new HashSet<>(1);
// metrics.add(new SimpleMetric(METRIC_TYPE.count,buck.getSecond()));
buckets.add(new Bucket(buck.getFirst(), filterQuery,buck.getSecond(),display));
}
ffcs.add(new FacetFieldContext(facet.getKey(), buckets));