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

Timestamp:

01/17/08 23:11:29 (11 months ago)

Author:

cyrusdaboo

Message:

Support for returning the component being read.

Files:

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

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

@@ -401 +401 @@
 }
 
-void CCardDAVVCardClient::ReadAddressBookComponent(const cdstring& rurl, vCard::CVCardAddressBook& adbk)
+vCard::CVCardVCard* CCardDAVVCardClient::ReadAddressBookComponent(const cdstring& rurl, vCard::CVCardAddressBook& adbk)
 {
         // Create WebDAV GET
@@ -420 +420 @@
                 // Handle error and exit here
                 HandleHTTPError(request.get());
-                return;
+                return NULL;
         }
 
@@ -444 +444 @@
         cdstring data = dout.GetData();
         std::istrstream is(data.c_str());
-        adbk.ParseComponent(is, last_path, etag);
+        return adbk.ParseComponent(is, last_path, etag);
 }
 
@@ -615 +615 @@
 
 // Read single component from server
-void CCardDAVVCardClient::_ReadComponent(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstring& comp_rurl)
+vCard::CVCardVCard* CCardDAVVCardClient::_ReadComponent(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstring& comp_rurl)
 {
         // Start UI action
@@ -625 +625 @@
 
         // Read it in   
-        ReadAddressBookComponent(rurl, vadbk);
+        return ReadAddressBookComponent(rurl, vadbk);
 }