diff -r 781def950a85 -r 9030e8a4481e web/facet.py --- a/web/facet.py Fri Jul 01 12:20:24 2011 +0200 +++ b/web/facet.py Fri Jul 01 15:22:43 2011 +0200 @@ -78,7 +78,7 @@ def prepare_facets_rqlst(rqlst, args=None): """prepare a syntax tree to generate facet filters - * remove ORDERBY clause + * remove ORDERBY/GROUPBY clauses * cleanup selection (remove everything) * undefine unnecessary variables * set DISTINCT @@ -91,8 +91,10 @@ select.set_limit(None) select.set_offset(None) baserql = select.as_string(kwargs=args) - # cleanup sort terms + # cleanup sort terms / group by select.remove_sort_terms() + select.remove_groups() + # XXX remove aggregat from having # selection: only vocabulary entity for term in select.selection[:]: select.remove_selected(term)