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 searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
136941 msuzuki: Search-340, added date parsing to range


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:12:27 +00:00
parent 0993e160ae
commit ecd2c1b3ea
2 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/java/org/alfresco/rest/api/search/impl/RangeResultMapper.java
View File

@@ -71,46 +71,7 @@ public class RangeResultMapper
} }
return ffcs; return ffcs;
} }
private static boolean isRangeStartInclusive(List<String> values)
{
if(values != null && !values.isEmpty())
{
for(String startInc : values)
switch (startInc)
{
case "upper":
return false;
case "outer":
return false;
default:
break;
}
}
return true;
}
private static boolean isRangeEndInclusive(List<String> endIncs)
{
if(endIncs != null && !endIncs.isEmpty())
{
for(String endInc : endIncs)
{
switch (endInc)
{
case "upper":
return true;
case "edge":
return true;
case "outer":
return true;
case "all":
return true;
default:
break;
}
}
}
return false;
}
/** /**
* Builds the generic facet response out of range results. * Builds the generic facet response out of range results.
* @param facetField * @param facetField
@@ -131,8 +92,8 @@ public class RangeResultMapper
List<String> includes = range.getInclude(); List<String> includes = range.getInclude();
if(includes != null && !includes.isEmpty()) if(includes != null && !includes.isEmpty())
{ {
startInclusive = isRangeStartInclusive(includes); startInclusive = range.isRangeStartInclusive();
endInclusive = isRangeEndInclusive(includes); endInclusive = range.isRangeEndInclusive();
} }
} }
} }

7
source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
View File

@@ -533,14 +533,17 @@ public class ResultMapperTests
assertEquals(4, rangeFacets.get(0).getBuckets().size()); assertEquals(4, rangeFacets.get(0).getBuckets().size());
assertEquals(3, rangeFacets.get(1).getBuckets().size()); assertEquals(3, rangeFacets.get(1).getBuckets().size());
assertEquals("content.size",rangeFacets.get(1).getLabel()); assertEquals("content.size",rangeFacets.get(1).getLabel());
assertEquals("(0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel()); assertEquals("[0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel());
Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray(); Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count")); assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
assertEquals("content.size:<0 TO 100]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery()); assertEquals("content.size:[0 TO 100]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count")); assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo(); Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
assertEquals("0",facetInfo.get("start")); assertEquals("0",facetInfo.get("start"));
assertEquals("100",facetInfo.get("end")); assertEquals("100",facetInfo.get("end"));
assertEquals("true",facetInfo.get("startInclusive"));
assertEquals("true",facetInfo.get("endInclusive"));
} }
@Test @Test