From 36a9a488d97768b4d0bd8093e585595e7b02cb7c Mon Sep 17 00:00:00 2001 From: Gethin James Date: Tue, 6 Sep 2016 15:39:04 +0000 Subject: [PATCH] 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 --- .../repo/search/impl/solr/SolrQueryHTTPClient.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java index 15c82314a8..90d025c38b 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java +++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java @@ -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