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

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
136093 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135772 gjames: SEARCH-419: Correct handling of fieldfacet label and exclusion filters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:00:06 +00:00
parent 20746d9f8a
commit 2f42e9814b
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -357,11 +357,6 @@ public class SearchMapper
{ {
ParameterCheck.mandatoryString("facetFields facet field", facet.getField()); ParameterCheck.mandatoryString("facetFields facet field", facet.getField());
String field = facet.getField(); String field = facet.getField();
if (facet.getExcludeFilters() != null && !facet.getExcludeFilters().isEmpty())
{
int startIndex = field.startsWith("{!afts")?7:0;
field = "{!afts ex="+String.join(",", facet.getExcludeFilters())+"}"+field.substring(startIndex);
}
FieldFacet ff = new FieldFacet(field); FieldFacet ff = new FieldFacet(field);
@@ -390,6 +385,8 @@ public class SearchMapper
} }
ff.setPrefix(facet.getPrefix()); ff.setPrefix(facet.getPrefix());
ff.setLabel(facet.getLabel());
ff.setExcludeFilters(facet.getExcludeFilters());
ff.setCountDocsMissingFacetField(facet.getMissing()); ff.setCountDocsMissingFacetField(facet.getMissing());
ff.setLimitOrNull(facet.getLimit()); ff.setLimitOrNull(facet.getLimit());
ff.setOffset(facet.getOffset()); ff.setOffset(facet.getOffset());

13
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -520,19 +520,6 @@ public class SearchMapperTests
assertEquals("ENUM" ,ff.getMethod().toString()); assertEquals("ENUM" ,ff.getMethod().toString());
} }
@Test
public void fromMultiSelectFacetFields() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null,"INDEX","ENUM",null,null,null,null,Arrays.asList("tag1"),null))));
FieldFacet ff = searchParameters.getFieldFacets().get(0);
assertEquals("{!afts ex=tag1}myfield" , ff.getField());
searchParameters = new SearchParameters();
searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("{!afts}thefield",null,null,null,null,null,null,null,null,Arrays.asList("tag5"),null))));
ff = searchParameters.getFieldFacets().get(0);
assertEquals("{!afts ex=tag5}thefield" , ff.getField());
}
@Test @Test
public void fromLimits() throws Exception public void fromLimits() throws Exception
{ {