Mercurial > libervia-backend
comparison frontends/src/bridge/DBus.py @ 2013:b536dd121da1
backend (memory), frontends: improved history filtering:
a "filters" dictionnary is now use to filter, it can have, for now, filtering on:
- "body": filter only on the body (equivalent to former "search" parameter, but not case sensitive)
- "search": fitler on body + source resource
- "types": allowed types
- "not_types": forbidden types
primitivus now do searching using "search", i.e. source resource is now taken into account (and search is now case insensitive)
author | Goffi <goffi@goffi.org> |
---|---|
date | Mon, 18 Jul 2016 00:52:02 +0200 |
parents | a2bc5089c2eb |
children | 046449cc2bff |
comparison
equal
deleted
inserted
replaced
2012:53587e738aca | 2013:b536dd121da1 |
---|---|
506 kwargs['timeout'] = const_TIMEOUT | 506 kwargs['timeout'] = const_TIMEOUT |
507 kwargs['reply_handler'] = callback | 507 kwargs['reply_handler'] = callback |
508 kwargs['error_handler'] = error_handler | 508 kwargs['error_handler'] = error_handler |
509 return self.db_core_iface.getWaitingSub(profile_key, **kwargs) | 509 return self.db_core_iface.getWaitingSub(profile_key, **kwargs) |
510 | 510 |
511 def historyGet(self, from_jid, to_jid, limit, between=True, search='', profile="@NONE@", callback=None, errback=None): | 511 def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): |
512 if callback is None: | 512 if callback is None: |
513 error_handler = None | 513 error_handler = None |
514 else: | 514 else: |
515 if errback is None: | 515 if errback is None: |
516 errback = log.error | 516 errback = log.error |
517 error_handler = lambda err:errback(dbus_to_bridge_exception(err)) | 517 error_handler = lambda err:errback(dbus_to_bridge_exception(err)) |
518 return self.db_core_iface.historyGet(from_jid, to_jid, limit, between, search, profile, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) | 518 return self.db_core_iface.historyGet(from_jid, to_jid, limit, between, filters, profile, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) |
519 | 519 |
520 def isConnected(self, profile_key="@DEFAULT@", callback=None, errback=None): | 520 def isConnected(self, profile_key="@DEFAULT@", callback=None, errback=None): |
521 if callback is None: | 521 if callback is None: |
522 error_handler = None | 522 error_handler = None |
523 else: | 523 else: |