Changeset 148 for Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVReportParser.cpp

Timestamp:

01/02/08 00:03:39 (1 year ago)

Author:

daboo

Message:

Lots of CardDAV stuff.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVReportParser.cpp (modified) (6 diffs)

Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVReportParser.cpp

@@ -40 +40 @@
 using namespace xmllib; 
 
+CCardDAVReportParser::CCardDAVReportParser(vCard::CVCardAddressBook& vadbk)
+{
+        mVAdbk = &vadbk;
+        mAdbk = NULL;
+        mAddrs = NULL;
+        mAddItems = false;
+}
+
 CCardDAVReportParser::CCardDAVReportParser(vCard::CVCardAddressBook& vadbk, CAddressBook* adbk, bool add)
 {
         mVAdbk = &vadbk;
         mAdbk = adbk;
+        mAddrs = NULL;
+        mAddItems = add;
+}
+
+CCardDAVReportParser::CCardDAVReportParser(vCard::CVCardAddressBook& vadbk, CAddressList* addrs, bool add)
+{
+        mVAdbk = &vadbk;
+        mAdbk = NULL;
+        mAddrs = addrs;
         mAddItems = add;
 }
@@ -71 +88 @@
                 else if ((*iter)->CompareFullName(cElement_propstat))
                 {
-                        ParsePropStat(*iter, etag);
-                }
-                
-                // Is it adbk-data
-                else if ((*iter)->CompareFullName(cElement_adbkdata))
-                {
-                        ParseAdbkData(*iter, href, etag);
+                        ParsePropStat(*iter, href, etag);
                 }
         }
 }
 
-void CCardDAVReportParser::ParsePropStat(const xmllib::XMLNode* response, cdstring& etag)
+void CCardDAVReportParser::ParsePropStat(const xmllib::XMLNode* response, const cdstring& href, cdstring& etag)
 {
         // Scan the propstat node the status - we only process OK status
@@ -110 +121 @@
                                 if ((*iter)->CompareFullName(webdav::cElement_prop))
                                 {
-                                        ParseProp(*iter, etag);
+                                        ParseProp(*iter, href, etag);
                                 }
                         }
@@ -118 +129 @@
 }
 
-void CCardDAVReportParser::ParseProp(const xmllib::XMLNode* response, cdstring& etag)
+void CCardDAVReportParser::ParseProp(const xmllib::XMLNode* response, const cdstring& href, cdstring& etag)
 {
         // Scan the prop node - each child is processed
         for(XMLNodeList::const_iterator iter = response->Children().begin(); iter != response->Children().end(); iter++)
         {
-                ParsePropElement(*iter, etag);
+                ParsePropElement(*iter, href, etag);
         }
 }
 
-void CCardDAVReportParser::ParsePropElement(const xmllib::XMLNode* response, cdstring& etag)
+void CCardDAVReportParser::ParsePropElement(const xmllib::XMLNode* response, const cdstring& href, cdstring& etag)
 {
         // Here we need to detect the type of element and dispatch accordingly
@@ -143 +154 @@
                 etag = response->Data();
         }
+                
+        // Is it adbk-data
+        else if (response->CompareFullName(cElement_adbkdata))
+        {
+                ParseAdbkData(response, href, etag);
+        }
 }
 
@@ -155 +172 @@
         std::istrstream is(response->Data().c_str());
         vCard::CVCardVCard* vcard = mVAdbk->ParseComponent(is, last_path, etag);
-        if ((mAdbk != NULL) && mAddItems)
-                vcardstore::MapFromVCard(mAdbk, *vcard);
+        if ((vcard != NULL) && mAddItems)
+        {
+                if (mAdbk != NULL)
+                        vcardstore::MapFromVCard(mAdbk, *vcard);
+                else if (mAddrs != NULL)
+                        vcardstore::MapFromVCard(mAddrs, *vcard);
+        }
 }