Changeset 156

Show
Ignore:
Timestamp:
01/19/08 15:33:34 (7 months ago)
Author:
cyrusdaboo
Message:

Use single query for multi-field search.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Mulberry/branches/v4.1d1/Sources_Common/Mail/AddressBook/CAddressBookManager.cp

    r149 r156  
    990990        // Search for addresses in Mulberry address books 
    991991        CAddressList addr_list; 
     992        CAdbkAddress::CAddressFields fields; 
    992993        if (CPreferences::sPrefs->mExpandFullName.GetValue()) 
    993994        { 
    994                 SearchAddress(expand, CAdbkAddress::eMatchAnywhere, CAdbkAddress::eName, addr_list); 
     995                fields.push_back(CAdbkAddress::eName); 
    995996        } 
    996997        if (CPreferences::sPrefs->mExpandNickName.GetValue()) 
    997998        { 
    998                 SearchAddress(expand, CAdbkAddress::eMatchAnywhere, CAdbkAddress::eNickName, addr_list); 
     999                fields.push_back(CAdbkAddress::eNickName); 
    9991000        } 
    10001001        if (CPreferences::sPrefs->mExpandEmail.GetValue()) 
    10011002        { 
    1002                 SearchAddress(expand, CAdbkAddress::eMatchAnywhere, CAdbkAddress::eEmail, addr_list); 
    1003  
    1004         } 
     1003                fields.push_back(CAdbkAddress::eEmail); 
     1004        } 
     1005        SearchAddress(expand, CAdbkAddress::eMatchAnywhere, fields, addr_list); 
    10051006 
    10061007        // Search for addresses in LDAP (only if required)