Changeset 152 for Mulberry

Timestamp:

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

Author:

cyrusdaboo

Message:

Support for returning the component being read.

Location:

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

Files:

• CCardDAVVCardClient.cpp (modified) (5 diffs)
• CCardDAVVCardClient.h (modified) (3 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);
 }
 

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

@@ -50 +50 @@
         virtual CINETClient*    CloneConnection();                      // Create duplicate, empty connection
 
-protected:
-
         // P R O T O C O L
 
@@ -98 +96 @@
         virtual void _RemoveComponent(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstring& rurl);
         virtual void _ReadComponents(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstrvect& rurls);
-        virtual void _ReadComponent(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstring& rurl);
+        virtual vCard::CVCardVCard* _ReadComponent(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const cdstring& rurl);
 
+protected:
         virtual void ListAddressBooks(CAddressBook* root, const http::webdav::CWebDAVPropFindParser& parser);
 
@@ -105 +104 @@
         virtual void ReadAddressBookComponents(CAddressBook* adbk, const cdstrvect& hrefs, vCard::CVCardAddressBook& vadbk);
         virtual void GetAddressBookComponents(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const http::webdav::CWebDAVPropFindParser& parser, cdstrmap& compinfo, bool last_path);
-        virtual void ReadAddressBookComponent(const cdstring& url, vCard::CVCardAddressBook& adbk);
+        virtual vCard::CVCardVCard* ReadAddressBookComponent(const cdstring& url, vCard::CVCardAddressBook& adbk);
         
         virtual void WriteAddressBookComponents(CAddressBook* adbk, vCard::CVCardAddressBook& vadbk, const vCard::CVCardComponentDB& components);