Changeset 149 for Mulberry/branches/v4.1d1/Sources_Common/Mail/AddressBook/CAddressBookManager.cp

Timestamp:

01/13/08 12:24:39 (11 months ago)

Author:

cyrusdaboo

Message:

Support address book queries on multiple fields in a single request.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Mail/AddressBook/CAddressBookManager.cp (modified) (3 diffs)

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

@@ -913 +913 @@
 void CAddressBookManager::SearchAddress(const cdstring& name, CAdbkAddress::EAddressMatch match, CAdbkAddress::EAddressField field, CAddressList& results)
 {
+        // Search
+        CAdbkAddress::CAddressFields fields;
+        fields.push_back(field);
+        SearchAddress(name, match, fields, results);
+}
+
+// Do search
+void CAddressBookManager::SearchAddress(const cdstring& name, CAdbkAddress::EAddressMatch match, const CAdbkAddress::CAddressFields& fields, CAddressList& results)
+{
         // Look through all address books
         for(CAddressBookList::const_iterator iter = mAdbkSearch.begin(); iter != mAdbkSearch.end(); iter++)
@@ -922 +931 @@
 #endif
 
-                (*iter)->SearchAddress(name, match, field, results);
+                (*iter)->SearchAddress(name, match, fields, results);
         }
 }
@@ -1195 +1204 @@
                         // See if it exists
                         CAddressList found;
-                        adbk->SearchAddress(email, CAdbkAddress::eMatchExactly, CAdbkAddress::eEmail, found);
+                        CAdbkAddress::CAddressFields fields;
+                        fields.push_back(CAdbkAddress::eEmail);
+                        adbk->SearchAddress(email, CAdbkAddress::eMatchExactly, fields, found);
                         
                         // If its empty then do capture