Changeset 157 for Mulberry

Timestamp:

01/19/08 15:36:12 (11 months ago)

Author:

cyrusdaboo

Message:

Make sure queries work.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/VCard_Store/Clients/CCardDAVVCardClient.cpp (modified) (3 diffs)

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

@@ -856 +856 @@
 void CCardDAVVCardClient::_ResolveAddress(CAddressBook* adbk, const char* nick_name, CAdbkAddress*& addr)
 {
-        // vCard address book must exist
-        vCard::CVCardAddressBook* vadbk = adbk->GetVCardAdbk();
-        if (vadbk == NULL)
-                return;
-
         StINETClientAction action(this, "Status::IMSP::SearchAddress", "Error::IMSP::OSErrSearchAddress", "Error::IMSP::NoBadSearchAddress");
 
@@ -892 +887 @@
                                                                         CAddressList& addr_list)
 {
-        // vCard address book must exist
-        vCard::CVCardAddressBook* vadbk = adbk->GetVCardAdbk();
-        if (vadbk == NULL)
-                return;
-
         StINETClientAction action(this, "Status::IMSP::SearchAddress", "Error::IMSP::OSErrSearchAddress", "Error::IMSP::NoBadSearchAddress");
 
@@ -1069 +1059 @@
 
         vCard::CVCardAddressBook temp;
-        http::carddav::CCardDAVReportParser parser(temp, addr_list, true);
-        parser.ParseData(dout.GetData());
+        if (addr_list != NULL)
+        {
+                http::carddav::CCardDAVReportParser parser(temp, addr_list, true);
+                parser.ParseData(dout.GetData());
+        }
+        else if (adbk != NULL)
+        {
+                http::carddav::CCardDAVReportParser parser(temp, adbk, true);
+                parser.ParseData(dout.GetData());
+        }
 }