From 2f7aa40d6f48f725eca629ff8a47eb8922467032 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Tue, 11 Aug 2015 10:17:55 +0200 Subject: Fixed unit test. --- service/pixelated/adapter/search/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'service/pixelated/adapter/search/__init__.py') diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py index e1ce5e8c..46691926 100644 --- a/service/pixelated/adapter/search/__init__.py +++ b/service/pixelated/adapter/search/__init__.py @@ -129,9 +129,9 @@ class SearchEngine(object): 'sender': self._unicode_header_field(header.get('from', '')), 'subject': self._unicode_header_field(header.get('subject', '')), 'date': milliseconds(header.get('date', '')), - 'to': u','.join([h for h in header.get('to', [''])]), - 'cc': u','.join([h for h in header.get('cc', [''])]), - 'bcc': u','.join([h for h in header.get('bcc', [''])]), + 'to': self._format_recipient(header, 'to'), + 'cc': self._format_recipient(header, 'cc'), + 'bcc': self._format_recipient(header, 'bcc'), 'tag': u','.join(unique(tags)), 'bounced': u','.join(bounced), 'body': unicode(mdict['textPlainBody'] if 'textPlainBody' in mdict else mdict['body']), @@ -142,6 +142,10 @@ class SearchEngine(object): writer.update_document(**index_data) + def _format_recipient(self, headers, name): + list = headers.get(name, ['']) + return u','.join(list) if list else u'' + def _unicode_header_field(self, field_value): if not field_value: return None -- cgit v1.2.3