Changeset 86 for Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp

Timestamp:

07/09/07 10:02:18 (2 years ago)

Author:

daboo

Message:

Some 4.1 changes. Mostly vCard/CardDAV and CalDAV scheduling support.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp (modified) (5 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp

@@ -355 +355 @@
         if (dynamic_cast<CWebDAVCalendarClient*>(copy_it))
                 mClient = new CWebDAVCalendarClient(static_cast<const CWebDAVCalendarClient&>(*copy_it), this);
+        else if (dynamic_cast<CCalDAVCalendarClient*>(copy_it))
+                mClient = new CCalDAVCalendarClient(static_cast<const CCalDAVCalendarClient&>(*copy_it), this);
         else if (dynamic_cast<CLocalCalendarClient*>(copy_it))
                 mClient = new CLocalCalendarClient(static_cast<const CLocalCalendarClient&>(*copy_it), this);
@@ -1080 +1082 @@
                 
                 // Step 3
+                cdstrset matching_components;
                 for(cdstrvect::const_iterator iter = component_keys.begin(); iter != component_keys.end(); iter++)
                 {
@@ -1175 +1178 @@
                         // Step 3.5
                         if (!server_rurl.empty())
-                                comps.erase(server_rurl);
+                                matching_components.insert(server_rurl);
                 }
                 
@@ -1182 +1185 @@
                 for(cdstrmap::const_iterator iter = comps.begin(); iter != comps.end(); iter++)
                 {
-                        rurls.push_back((*iter).first);
+                        cdstrset::const_iterator found = matching_components.find((*iter).first);
+                        if (found == matching_components.end())
+                                rurls.push_back((*iter).first);
                 }
 
@@ -1547 +1552 @@
 }
 
+void CCalendarProtocol::GetScheduleInboxOutbox(cdstring& inboxURI, cdstring& outboxURI)
+{
+        // Do nothing if not available
+        if (!GetHasScheduling())
+                return;
+
+        // Must block
+        cdmutex::lock_cdmutex _lock(_mutex);
+
+        // Verify its still active because mutex wait could have resulted in closure
+        if (!IsLoggedOn())
+                return;
+
+        // Send command to server
+        // Calendar will take care of recovery
+        mClient->_GetScheduleInboxOutbox(mStoreRoot, inboxURI, outboxURI);
+}
+
+void CCalendarProtocol::Schedule(const cdstring& outboxURI,
+                                                                 const cdstring& originator,
+                                                                 const cdstrvect& recipients,
+                                                                 const iCal::CICalendar& cal,
+                                                                 iCal::CITIPScheduleResultsList& results)
+{
+        // Do nothing if not available
+        if (!GetHasScheduling())
+                return;
+
+        // Must block
+        cdmutex::lock_cdmutex _lock(_mutex);
+
+        // Verify its still active because mutex wait could have resulted in closure
+        if (!IsLoggedOn())
+                return;
+
+        // Send command to server
+        // Calendar will take care of recovery
+        mClient->_Schedule(outboxURI, originator, recipients, cal, results);
+}
+
+void CCalendarProtocol::GetFreeBusyCalendars(cdstrvect& calendars)
+{
+        // Do nothing if not available
+        if (!GetHasScheduling())
+                return;
+        
+        // Must block
+        cdmutex::lock_cdmutex _lock(_mutex);
+        
+        // Verify its still active because mutex wait could have resulted in closure
+        if (!IsLoggedOn())
+                return;
+        
+        // Send command to server
+        mClient->_GetFreeBusyCalendars(calendars);
+}
+
+void CCalendarProtocol::SetFreeBusyCalendars(const cdstrvect& calendars)
+{
+        // Do nothing if not available
+        if (!GetHasScheduling())
+                return;
+        
+        // Must block
+        cdmutex::lock_cdmutex _lock(_mutex);
+        
+        // Verify its still active because mutex wait could have resulted in closure
+        if (!IsLoggedOn())
+                return;
+        
+        // Send command to server
+        mClient->_SetFreeBusyCalendars(calendars);
+}
+
 #pragma mark ____________________________Disconnected