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 
137045 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136712 msuzuki: Search-340, added filterQuery to facet range response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:14:23 +00:00
parent d6ccfa432f
commit cd217d1ffc
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,7 @@ public class ResultMapper
Map<String, List<Pair<String, Integer>>> facetInterval = solrResultSet.getFacetIntervals(); Map<String, List<Pair<String, Integer>>> facetInterval = solrResultSet.getFacetIntervals();
facets.addAll(getGenericFacetsForIntervals(facetInterval, searchQuery)); facets.addAll(getGenericFacetsForIntervals(facetInterval, searchQuery));
Map<String,List> facetRanges = solrResultSet.getFacetRanges(); Map<String,List<Map<String,String>>> facetRanges = solrResultSet.getFacetRanges();
facets.addAll(getGenericFacetsForRanges(facetRanges, searchQuery)); facets.addAll(getGenericFacetsForRanges(facetRanges, searchQuery));
List<GenericFacetResponse> stats = getFieldStats(searchRequestContext, solrResultSet.getStats()); List<GenericFacetResponse> stats = getFieldStats(searchRequestContext, solrResultSet.getStats());
@@ -490,38 +490,38 @@ public class ResultMapper
* @param searchQuery * @param searchQuery
* @return GenericFacetResponse * @return GenericFacetResponse
*/ */
protected static List<GenericFacetResponse> getGenericFacetsForRanges( Map<String,List> facetFields, SearchQuery searchQuery) protected static List<GenericFacetResponse> getGenericFacetsForRanges( Map<String,List<Map<String,String>>> facetFields, SearchQuery searchQuery)
{ {
List<GenericFacetResponse> ffcs = new ArrayList<>(facetFields.size()); List<GenericFacetResponse> ffcs = new ArrayList<>(facetFields.size());
if (facetFields != null && !facetFields.isEmpty()) if (facetFields != null && !facetFields.isEmpty() && searchQuery.getQuery() != null)
{ {
List<GenericBucket> buckets = new ArrayList<>(); List<GenericBucket> buckets = new ArrayList<>();
for (Entry<String, List> facet : facetFields.entrySet()) for (Entry<String, List<Map<String, String>>> facet : facetFields.entrySet())
{ {
facet.getValue().forEach(action -> buckets.add(buildGenericBucketFromRange((Map<String, String>) action))); facet.getValue().forEach(action -> buckets.add(buildGenericBucketFromRange(facet.getKey(), (Map<String, String>) action)));
ffcs.add(new GenericFacetResponse(FACET_TYPE.range, facet.getKey(), buckets)); ffcs.add(new GenericFacetResponse(FACET_TYPE.range, facet.getKey(), buckets));
} }
} }
return ffcs; return ffcs;
} }
private static GenericBucket buildGenericBucketFromRange(Map<String,String> facet) private static GenericBucket buildGenericBucketFromRange(String facetField, Map<String,String> facet)
{ {
return new GenericBucket(facet.get("label"), String from = facet.get("from");
null, String to = facet.get("to");
null, String label = facet.get("label");
new HashSet<Metric>(Arrays.asList(new SimpleMetric(METRIC_TYPE.count,facet.get("count")))), facet.remove("label");
null, String filterQ = String.format("%s:(%s TO %s)",
appendRangeInfo(facet.get("from"), facet.get("to"))); facetField,
from,
to);
return new GenericBucket(label,
filterQ,
null,
new HashSet<Metric>(Arrays.asList(new SimpleMetric(METRIC_TYPE.count,facet.get("count")))),
null,
facet);
} }
private static Map appendRangeInfo(String from, String to)
{
// TODO Auto-generated method stub
Map<String,String> rangeInfo = new HashMap<String,String>(2);
rangeInfo.put("from", from);
rangeInfo.put("to", to);
return rangeInfo;
}
/** /**

5
source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
View File

@@ -479,6 +479,7 @@ public class ResultMapperTests
assertEquals("0 - 100",rangeFacets.get(0).getBuckets().get(0).getLabel()); assertEquals("0 - 100",rangeFacets.get(0).getBuckets().get(0).getLabel());
Object[] metrics = rangeFacets.get(0).getBuckets().get(0).getMetrics().toArray(); Object[] metrics = rangeFacets.get(0).getBuckets().get(0).getMetrics().toArray();
assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count")); assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
assertEquals("content.size:(0 TO 100)", rangeFacets.get(0).getBuckets().get(0).getFilterQuery());
Map<String, String> facetInfo = rangeFacets.get(0).getBuckets().get(0).getFacetInfo(); Map<String, String> facetInfo = rangeFacets.get(0).getBuckets().get(0).getFacetInfo();
assertEquals("0",facetInfo.get("from")); assertEquals("0",facetInfo.get("from"));
@@ -490,13 +491,15 @@ public class ResultMapperTests
facetInfo = rangeFacets.get(0).getBuckets().get(1).getFacetInfo(); facetInfo = rangeFacets.get(0).getBuckets().get(1).getFacetInfo();
assertEquals("100",facetInfo.get("from")); assertEquals("100",facetInfo.get("from"));
assertEquals("200",facetInfo.get("to")); assertEquals("200",facetInfo.get("to"));
assertEquals("content.size:(100 TO 200)", rangeFacets.get(0).getBuckets().get(1).getFilterQuery());
assertEquals("200 - 300",rangeFacets.get(0).getBuckets().get(2).getLabel()); assertEquals("200 - 300",rangeFacets.get(0).getBuckets().get(2).getLabel());
metrics = rangeFacets.get(0).getBuckets().get(2).getMetrics().toArray(); metrics = rangeFacets.get(0).getBuckets().get(2).getMetrics().toArray();
assertEquals("3",((SimpleMetric) metrics[0]).getValue().get("count")); assertEquals("3",((SimpleMetric) metrics[0]).getValue().get("count"));
facetInfo = rangeFacets.get(0).getBuckets().get(2).getFacetInfo(); facetInfo = rangeFacets.get(0).getBuckets().get(2).getFacetInfo();
assertEquals("200",facetInfo.get("from")); assertEquals("200",facetInfo.get("from"));
assertEquals("300",facetInfo.get("to")); assertEquals("300",facetInfo.get("to"));
assertEquals("content.size:(200 TO 300)", rangeFacets.get(0).getBuckets().get(2).getFilterQuery());
} }
@Test @Test