Changeset 158

Timestamp:

01/19/08 22:48:26 (11 months ago)

Author:

cyrusdaboo

Message:

Support local searching.

Location:

Mulberry/branches/v4.1d1/Sources_Common/VCard_Store

Files:

• CVCardSearch.cpp (added)
• CVCardSearch.h (added)
• Clients/CLocalVCardClient.cpp (modified) (4 diffs)
• Clients/CLocalVCardClient.h (modified) (1 diff)

Mulberry/branches/v4.1d1/Sources_Common/VCard_Store/Clients/CLocalVCardClient.cpp

@@ -32 +32 @@
 
 #include "CVCardMapper.h"
+#include "CVCardSearch.h"
 
 #include "CVCardAddressBook.h"
+#include "CVCardDefinitions.h"
 #include "CVCardVCard.h"
 
@@ -791 +793 @@
         {
                 // Fetch all matching addresses
-                //SearchAddressBook(adbk, nick_name, CAdbkAddress::eNickName, NULL, NULL);
+                CAdbkAddress::CAddressFields fields;
+                fields.push_back(CAdbkAddress::eNickName);
+                SearchAddressBook(adbk, nick_name, fields, NULL, NULL);
         }
         catch (...)
@@ -836 +840 @@
 
                 // Fetch all addresses
-                //SearchAddressBook(adbk, matchit, fields, &addr_list, NULL);
+                SearchAddressBook(adbk, matchit, fields, &addr_list, NULL);
         }
         catch (...)
@@ -978 +982 @@
         return result;
 }
+
+void CLocalVCardClient::SearchAddressBook(CAddressBook* adbk, const cdstring& pattern, const CAdbkAddress::CAddressFields& fields,
+                                                                                        CAddressList* addr_list, CGroupList* grp_list)
+{
+        // Map adbk field to vCard property
+        cdstrvect prop_names;
+        for(CAdbkAddress::CAddressFields::const_iterator iter = fields.begin(); iter != fields.end(); iter++)
+        {
+                switch(*iter)
+                {
+                case CAdbkAddress::eName:
+                        prop_names.push_back(vCard::cVCardProperty_FN);
+                        break;
+                case CAdbkAddress::eNickName:
+                        prop_names.push_back(vCard::cVCardProperty_NICKNAME);
+                        break;
+                case CAdbkAddress::eEmail:
+                        prop_names.push_back(vCard::cVCardProperty_EMAIL);
+                        break;
+                case CAdbkAddress::eCompany:
+                        prop_names.push_back(vCard::cVCardProperty_ORG);
+                        break;
+                case CAdbkAddress::eAddress:
+                        prop_names.push_back(vCard::cVCardProperty_ADR);
+                        break;
+                case CAdbkAddress::ePhoneWork:
+                        prop_names.push_back(vCard::cVCardProperty_TEL);
+                        break;
+                case CAdbkAddress::ePhoneHome:
+                        prop_names.push_back(vCard::cVCardProperty_TEL);
+                        break;
+                case CAdbkAddress::eFax:
+                        prop_names.push_back(vCard::cVCardProperty_TEL);
+                        break;
+                case CAdbkAddress::eURL:
+                        prop_names.push_back(vCard::cVCardProperty_URL);
+                        break;
+                case CAdbkAddress::eNotes:
+                        prop_names.push_back(vCard::cVCardProperty_NOTE);
+                        break;
+                }
+        }
+
+        // Get name for new file
+        cdstring fpath = MapAdbkName(adbk);
+        
+        // Make sure it already exists
+        if (!::fileexists(fpath))
+        {
+                //throw CGeneralException(-1, "Address Book file does not exist");
+                throw CGeneralException(-1);
+        }
+        
+        // Read address book from file
+        cdifstream is(fpath);
+        vCard::CVCardAddressBook temp;
+        temp.Parse(is);
+
+        vcardstore::SearchVCards(temp, pattern, prop_names, adbk, addr_list);
+
+}

Mulberry/branches/v4.1d1/Sources_Common/VCard_Store/Clients/CLocalVCardClient.h

@@ -130 +130 @@
         void Append(CAddressBook* adbk, const CAddressList* add_addrs, const CGroupList* add_grps);
 
+        void SearchAddressBook (CAddressBook* adbk,
+                                                        const cdstring& pattern,
+                                                        const CAdbkAddress::CAddressFields& fields,
+                                                        CAddressList* addr_list,
+                                                        CGroupList* grp_list);
+
+
 private:
                         void    InitLocalClient();