debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Walk address groups and parse each address separately

Browse source 
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2009-10-14 21:17:39 -07:00
parent 5166406bef
commit 8f3ccda00f
1 changed files with 52 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
notmuch-index-message.cc
View file

@ -171,30 +171,44 @@ gen_terms_address_name (Xapian::TermGenerator term_gen,
InternetAddress *address, InternetAddress *address,
const char *prefix_name) const char *prefix_name)
{ {
const char *name; if (INTERNET_ADDRESS_IS_MAILBOX(address)) {
int own_name = 0; const char *name;
int own_name = 0;
name = internet_address_get_name (address); name = internet_address_get_name (address);
/* In the absence of a name, we'll strip the part before the @ /* In the absence of a name, we'll strip the part before the @
* from the address. */ * from the address. */
if (! name) { if (! name) {
InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address); InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
const char *addr = internet_address_mailbox_get_addr (mailbox); const char *addr = internet_address_mailbox_get_addr (mailbox);
const char *at; const char *at;
at = strchr (addr, '@'); at = strchr (addr, '@');
if (at) { if (at) {
name = strndup (addr, at - addr); name = strndup (addr, at - addr);
own_name = 1; own_name = 1;
}
}
if (name)
gen_terms (term_gen, prefix_name, name);
if (own_name)
free ((void *) name);
} else if (INTERNET_ADDRESS_IS_GROUP (address)) {
InternetAddressGroup *group = INTERNET_ADDRESS_GROUP (address);
InternetAddressList *list = internet_address_group_get_members(group);
if (list) {
int length = internet_address_list_length(list);
int i;
for (i = 0; i < length; i++)
gen_terms_address_name(term_gen,
internet_address_list_get_address(list, i),
prefix_name);
} }
} }
if (name)
gen_terms (term_gen, prefix_name, name);
if (own_name)
free ((void *) name);
} }
static void static void
@ -221,13 +235,27 @@ add_term_address_addr (Xapian::Document doc,
InternetAddress *address, InternetAddress *address,
const char *prefix_name) const char *prefix_name)
{ {
InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address); if (INTERNET_ADDRESS_IS_MAILBOX(address)) {
const char *addr; InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
const char *addr;
addr = internet_address_mailbox_get_addr (mailbox); addr = internet_address_mailbox_get_addr (mailbox);
if (addr) if (addr)
add_term (doc, prefix_name, addr); add_term (doc, prefix_name, addr);
} else if (INTERNET_ADDRESS_IS_GROUP (address)) {
InternetAddressGroup *group = INTERNET_ADDRESS_GROUP (address);
InternetAddressList *list = internet_address_group_get_members(group);
if (list) {
int length = internet_address_list_length(list);
int i;
for (i = 0; i < length; i++)
add_term_address_addr(doc,
internet_address_list_get_address(list, i),
prefix_name);
}
}
} }
static void static void