cubicweb: comparison web/facet.py

equal deleted inserted replaced

-:bef394c66f10
+:a6f056bc7d1d
 ## rqlst manipulation functions used by facets ################################
 def prepare_facets_rqlst(rqlst, args=None):
 """prepare a syntax tree to generate facet filters
 * remove ORDERBY clause
 * cleanup selection (remove everything)
 * undefine unnecessary variables
 * set DISTINCT
 * unset LIMIT/OFFSET
 def get_facet(req, facetid, rqlst, mainvar):
 return req.vreg.object_by_id('facets', facetid, req, rqlst=rqlst,
 filtered_variable=mainvar)
 def filter_hiddens(w, **kwargs):
 for key, val in kwargs.items():
 w(u'<input type="hidden" name="%s" value="%s" />' % (
 key, html_escape(val)))
 newvar, rel = _add_rtype_relation(rqlst, mainvar, rtype, role)
 if rqlst.groupby:
 rqlst.add_group_var(newvar)
 rqlst.add_selected(newvar)
 return newvar, rel
 def _remove_relation(rqlst, rel, var):
 """remove a constraint relation from the syntax tree"""
 # remove the relation
 rqlst.remove_node(rel)
 # remove relations where the filtered variable appears on the
 # and have no path to the main variable
 for ovarname in linkedvars:
 if ovarname == mainvar.name:
 continue
 if not has_path(vargraph, ovarname, mainvar.name):
 toremove.add(rqlst.defined_vars[ovarname])
 ## base facet classes #########################################################
 class AbstractFacet(AcceptMixIn, AppRsetObject):
 __registerer__ = priority_registerer
 __abstract__ = True
 __registry__ = 'facets'
 }
 visible = True
 context = ''
 needs_update = False
 start_unfolded = True
 @classmethod
 def selected(cls, req, rset=None, rqlst=None, context=None,
 filtered_variable=None):
 assert rset is not None or rqlst is not None
 assert filtered_variable
 @property
 def operator(self):
 # OR between selected values by default
 return self.req.form.get(self.id + '_andor', 'OR')
 def get_widget(self):
 """return the widget instance to use to display this facet
 """
 raise NotImplementedError
 def add_rql_restrictions(self):
 """add restriction for this facet into the rql syntax tree"""
 raise NotImplementedError
 class VocabularyFacet(AbstractFacet):
 needs_update = True
 def get_widget(self):
 """return the widget instance to use to display this facet
 default implentation expects a .vocabulary method on the facet and
 return a combobox displaying this vocabulary
 if value is None:
 wdg.append(FacetSeparator(label))
 else:
 wdg.append(FacetItem(self.req, label, value, value in selected))
 return wdg
 def vocabulary(self):
 """return vocabulary for this facet, eg a list of 2-uple (label, value)
 """
 raise NotImplementedError
 def possible_values(self):
 """return a list of possible values (as string since it's used to
 compare to a form value in javascript) for this facet
 """
 raise NotImplementedError
 def support_and(self):
 return False
 def rqlexec(self, rql, args=None, cachekey=None):
 try:
 return self.req.execute(rql, args, cachekey)
 except Unauthorized:
 return []
 class RelationFacet(VocabularyFacet):
 __selectors__ = (one_has_relation, match_context_prop)
 # class attributes to configure the relation facet
 rtype = None
 # set this to a stored procedure name if you want to sort on the result of
 # this function's result instead of direct value
 sortfunc = None
 # ascendant/descendant sorting
 sortasc = True
 @property
 def title(self):
 return display_name(self.req, self.rtype, form=self.role)
 def vocabulary(self):
 """return vocabulary for this facet, eg a list of 2-uple (label, value)
 """
 rqlst = self.rqlst
 self, rqlst.as_string())
 return ()
 finally:
 rqlst.recover()
 return self.rset_vocabulary(rset)
 def possible_values(self):
 """return a list of possible values (as string since it's used to
 compare to a form value in javascript) for this facet
 """
 rqlst = self.rqlst
 _cleanup_rqlst(rqlst, self.filtered_variable)
 _prepare_vocabulary_rqlst(rqlst, self.filtered_variable, self.rtype, self.role)
 return [str(x) for x, in self.rqlexec(rqlst.as_string())]
 finally:
 rqlst.recover()
 def rset_vocabulary(self, rset):
 _ = self.req._
 return [(_(label), eid) for eid, label in rset]
 @cached
 class AttributeFacet(RelationFacet):
 # attribute type
 attrtype = 'String'
+# type of comparison: default is an exact match on the attribute value
+comparator = '=' # could be '<', '<=', '>', '>='
 def vocabulary(self):
 """return vocabulary for this facet, eg a list of 2-uple (label, value)
 """
 rqlst = self.rqlst
 rqlst.save_state()
 self, rqlst.as_string())
 return ()
 finally:
 rqlst.recover()
 return self.rset_vocabulary(rset)
 def rset_vocabulary(self, rset):
 _ = self.req._
 return [(_(value), value) for value, in rset]
 def support_and(self):
 return False
 def add_rql_restrictions(self):
 """add restriction for this facet into the rql syntax tree"""
 value = self.req.form.get(self.id)
 if not value:
 return
 mainvar = self.filtered_variable
 self.rqlst.add_constant_restriction(mainvar, self.rtype, value,
-self.attrtype)
+self.attrtype, self.comparator)
 class FilterRQLBuilder(object):
 """called by javascript to get a rql string from filter form"""
 def __init__(self, req):
 self.req = req
 def build_rql(self):#, tablefilter=False):
 form = self.req.form
 facetids = form['facets'].split(',')
 select = parse(form['baserql']).children[0] # XXX Union unsupported yet
 mainvar = filtered_variable(select)
 facet.add_rql_restrictions()
 if facet.needs_update:
 toupdate.append(facetid)
 return select.as_string(), toupdate
 ## html widets ################################################################
 class FacetVocabularyWidget(HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.items = []
 def append(self, item):
 self.items.append(item)
 def _render(self):
 title = html_escape(self.facet.title)
 facetid = html_escape(self.facet.id)
 if len(self.items) > 6:
 self.w(u'<div id="%s" class="facet overflowed">\n' % facetid)
 for item in self.items:
 item.render(self.w)
 self.w(u'</div>\n')
 self.w(u'</div>\n')
 class FacetStringWidget(HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.value = None
 if self.selected:
 cssclass = ' facetValueSelected'
 imgsrc = self.req.datadir_url + self.selected_img
 else:
 cssclass = ''
 imgsrc = self.req.datadir_url + self.unselected_img
 self.w(u'<div class="facetValue facetCheckBox%s" cubicweb:value="%s">\n'
 % (cssclass, html_escape(unicode(self.value))))
 self.w(u'<img src="%s" />&nbsp;' % imgsrc)
 self.w(u'<a href="javascript: {}">%s</a>' % html_escape(self.label))
 self.w(u'</div>')
 class FacetSeparator(HTMLWidget):
 def __init__(self, label=None):
 self.label = label or u'&nbsp;'
 def _render(self):
 pass

changeset 467	a6f056bc7d1d
parent 446	3a3ab6bbccc5
child 496	e25a3c2f5393