Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] - convert mailadresses to lowercase to increase change for match 

- handle situation that optional mail address componenents not present in mail
      - slight reorganisation of code to aid debugging and made pep8 compliant as well.
pull/78/head
Ronald Portier 2013-04-04 21:32:01 +02:00
parent 05021bf360
commit 85ff68da13
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fetchmail_attach_from_folder/match_algorithm/email_exact.py
View File

@ -34,8 +34,9 @@ class email_exact(base):
mailaddresses = [] mailaddresses = []
fields = conf.mail_field.split(',') fields = conf.mail_field.split(',')
for field in fields: for field in fields:
if field in mail_message:
mailaddresses += to_email(mail_message[field]) mailaddresses += to_email(mail_message[field])
return mailaddresses return [ addr.lower() for addr in mailaddresses ]
def _get_mailaddress_search_domain( def _get_mailaddress_search_domain(
self, conf, mail_message, operator='=', values=None): self, conf, mail_message, operator='=', values=None):
@ -43,12 +44,13 @@ class email_exact(base):
conf, mail_message) conf, mail_message)
if not mailaddresses: if not mailaddresses:
return [(0, '=', 1)] return [(0, '=', 1)]
return ((['|'] * (len(mailaddresses) - 1)) + [ search_domain = ((['|'] * (len(mailaddresses) - 1)) + [
(conf.model_field, operator, addr) for addr in mailaddresses] + (conf.model_field, operator, addr) for addr in mailaddresses] +
safe_eval(conf.domain or '[]')) safe_eval(conf.domain or '[]'))
return search_domain
def search_matches(self, cr, uid, conf, mail_message, mail_message_org): def search_matches(self, cr, uid, conf, mail_message, mail_message_org):
return conf.pool.get(conf.model_id.model).search( conf_model = conf.pool.get(conf.model_id.model)
cr, uid, search_domain = self._get_mailaddress_search_domain(conf, mail_message)
self._get_mailaddress_search_domain(conf, mail_message), return conf_model.search(
order=conf.model_order) cr, uid, search_domain, order=conf.model_order)