gCubeSystem
/
accounting-analytics
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing limit 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics@126085 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-03-23 10:09:27 +00:00
parent ec4cb526eb
commit 9f3397483b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
View File

@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import org.gcube.accounting.analytics.Filter;
@ -139,22 +140,24 @@ public class AccountingPersistenceQuery {
TemporalConstraint temporalConstraint, List<Filter> filters,
String orderingProperty, boolean pad, int limit) throws Exception {
SortedMap<NumberedFilter, SortedMap<Calendar, Info>> ret;
SortedMap<NumberedFilter, SortedMap<Calendar, Info>> got;
if(orderingProperty==null){
orderingProperty = getDefaultOrderingProperties(clz);
}
ret = AccountingPersistenceBackendQueryFactory.getInstance()
got = AccountingPersistenceBackendQueryFactory.getInstance()
.getTopValues(clz, temporalConstraint,
filters, orderingProperty);
SortedMap<NumberedFilter, SortedMap<Calendar, Info>> ret = new TreeMap<NumberedFilter, SortedMap<Calendar,Info>>();
if(pad){
int count = ret.size() > limit ? limit : ret.size();
int count = got.size() > limit ? limit : got.size();
while(--count >= 0){
for(NumberedFilter nf : ret.keySet()){
padMap(ret.get(nf), temporalConstraint);
for(NumberedFilter nf : got.keySet()){
SortedMap<Calendar, Info> m = padMap(got.get(nf), temporalConstraint);
ret.put(nf, m);
}
}
}