inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
View File

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

9
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
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.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.end=").append(encoder.encode(""+searchParameters.getRange().getEnd(), "UTF-8"));
url.append("&facet.range.gap=").append(encoder.encode(""+searchParameters.getRange().getGap(), "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"));
} }
} }

19
source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java
View File

@@ -406,7 +406,7 @@ public class SolrQueryHTTPClientTest
{ {
SearchParameters params = new SearchParameters(); SearchParameters params = new SearchParameters();
params.setSearchTerm("A*"); params.setSearchTerm("A*");
RangeParameters range = new RangeParameters("content.size", 1,"0", "1000000", "10000", true, null, null, null, null); RangeParameters range = new RangeParameters("content.size", "0", "1000000", "10000", true, "before", "lower");
params.setRange(range); params.setRange(range);
StringBuilder urlBuilder = new StringBuilder(); StringBuilder urlBuilder = new StringBuilder();
client.buildRangeParameters(params, encoder, urlBuilder); client.buildRangeParameters(params, encoder, urlBuilder);
@@ -417,6 +417,23 @@ public class SolrQueryHTTPClientTest
assertTrue(url.contains("&facet.range.start=0")); assertTrue(url.contains("&facet.range.start=0"));
assertTrue(url.contains("&facet.range.end=1000000")); assertTrue(url.contains("&facet.range.end=1000000"));
assertTrue(url.contains("&facet.range.gap=10000")); assertTrue(url.contains("&facet.range.gap=10000"));
assertTrue(url.contains("&facet.range.include=lower"));
assertTrue(url.contains("&facet.range.other=before"));
assertTrue(url.contains("&facet.range.hardend=true"));
RangeParameters range2 = new RangeParameters("content.size", "0", "1000000", "10000", true, null, null);
params.setRange(range2);
urlBuilder = new StringBuilder();
client.buildRangeParameters(params, encoder, urlBuilder);
String url2 = urlBuilder.toString();
assertTrue(url2.contains("&facet=true"));
assertTrue(url2.contains("&facet.range=content.size"));
assertTrue(url2.contains("&facet.range.start=0"));
assertTrue(url2.contains("&facet.range.end=1000000"));
assertTrue(url2.contains("&facet.range.gap=10000"));
assertFalse(url2.contains("&facet.range.include=lower"));
assertFalse(url2.contains("&facet.range.other=before"));
assertTrue(url2.contains("&facet.range.hardend=true"));
} }
} }