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

136888 msuzuki: Search-340, align range response with interval response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:11:53 +00:00
parent 840eac1609
commit da5c6dd2cd
2 changed files with 36 additions and 13 deletions

View File

@@ -842,13 +842,19 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
url.append(String.format("&f.%s.facet.range.start=",fieldName)).append(encoder.encode(""+ facetRange.getStart(), "UTF-8"));
url.append(String.format("&f.%s.facet.range.end=",fieldName)).append(encoder.encode(""+ facetRange.getEnd(), "UTF-8"));
url.append(String.format("&f.%s.facet.range.gap=",fieldName)).append(encoder.encode(""+ facetRange.getGap(), "UTF-8"));
if(facetRange.getInclude() != null)
if(facetRange.getInclude() != null && !facetRange.getInclude().isEmpty())
{
url.append(String.format("&f.%s.facet.range.include=",fieldName)).append(encoder.encode("" + facetRange.getInclude(), "UTF-8"));
for(String include : facetRange.getInclude())
{
url.append(String.format("&f.%s.facet.range.include=",fieldName)).append(encoder.encode("" + include, "UTF-8"));
}
}
if(facetRange.getOther() != null)
if(facetRange.getOther() != null && !facetRange.getOther().isEmpty())
{
url.append(String.format("&f.%s.facet.range.other=",fieldName)).append(encoder.encode("" + facetRange.getOther(), "UTF-8"));
for(String other : facetRange.getOther())
{
url.append(String.format("&f.%s.facet.range.other=",fieldName)).append(encoder.encode("" + other, "UTF-8"));
}
}
url.append(String.format("&f.%s.facet.range.hardend=",fieldName)).append(encoder.encode("" + facetRange.isHardend(), "UTF-8"));
if(!facetRange.getExcludeFilters().isEmpty())