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

136690 msuzuki: Search-340, Added addtional params: include, other and hardend


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:08:20 +00:00
parent 3f1cdb2a84
commit 9edb795eff
3 changed files with 28 additions and 1 deletions

View File

@@ -300,6 +300,7 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
pivotFacets = buildPivot(facet_pivot, pivotName);
}
}
if(facet_counts.has("facet_ranges"))
{
JSONObject facet_ranges = facet_counts.getJSONObject("facet_ranges");

View File

@@ -826,6 +826,15 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
url.append("&facet.range.start=").append(encoder.encode(""+searchParameters.getRange().getStart(), "UTF-8"));
url.append("&facet.range.end=").append(encoder.encode(""+searchParameters.getRange().getEnd(), "UTF-8"));
url.append("&facet.range.gap=").append(encoder.encode(""+searchParameters.getRange().getGap(), "UTF-8"));
if(searchParameters.getRange().getInclude() != null)
{
url.append("&facet.range.include=").append(encoder.encode(""+searchParameters.getRange().getInclude(), "UTF-8"));
}
if(searchParameters.getRange().getOther() != null)
{
url.append("&facet.range.other=").append(encoder.encode(""+searchParameters.getRange().getOther(), "UTF-8"));
}
url.append("&facet.range.hardend=").append(encoder.encode(""+searchParameters.getRange().isHardend(), "UTF-8"));
}
}