Merged searchapi (5.2.1) to 5.2.N (5.2.1)

130061 gjames: SEARCH-120: Facet queries label support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:39:04 +00:00
parent 1154c0f39e
commit 36a9a488d9

View File

@@ -533,14 +533,22 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
}
for(String facetQuery : searchParameters.getFacetQueries())
{
url.append("&facet.query=").append(encoder.encode("{!afts}"+facetQuery, "UTF-8"));
if (!facetQuery.startsWith("{!afts"))
{
facetQuery = "{!afts}"+facetQuery;
}
url.append("&facet.query=").append(encoder.encode(facetQuery, "UTF-8"));
}
}
// filter queries
for(String filterQuery : searchParameters.getFilterQueries())
{
url.append("&fq=").append(encoder.encode("{!afts}"+filterQuery, "UTF-8"));
if (!filterQuery.startsWith("{!afts"))
{
filterQuery = "{!afts}"+filterQuery;
}
url.append("&fq=").append(encoder.encode(filterQuery, "UTF-8"));
}
// end of field facets