Changeset 166

Timestamp:

07/04/08 14:34:07 (2 months ago)

Author:

cyrusdaboo

Message:

Only read web calendars when the etag has changed. Fix some updating issues.

Location:

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

Files:

• CCalendarProtocol.cpp (modified) (13 diffs)
• CCalendarProtocol.h (modified) (1 diff)

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

@@ -821 +821 @@
                 // up to date.
         }
+        else if (IsWebCalendar())
+        {
+                SubscribeFullCalendar(node, cal);
+        }
         else
         {
@@ -895 +899 @@
         else
                 SyncFullFromServer(node, cal);
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1266 +1271 @@
 }
 
-void CCalendarProtocol::ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal)
+void CCalendarProtocol::ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed)
 {
         // Don't do on server if cache is primary
         if (mCacheIsPrimary)
-                mCacheClient->_ReadFullCalendar(node, cal);
+                mCacheClient->_ReadFullCalendar(node, cal, if_changed);
         else
-                mClient->_ReadFullCalendar(node, cal);
+                mClient->_ReadFullCalendar(node, cal, if_changed);
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1301 +1307 @@
 {
         // Always read from the main server
-        mClient->_ReadFullCalendar(node, cal);
+        bool if_changed = !cal.GetETag().empty();
+        mClient->_ReadFullCalendar(node, cal, if_changed);
 
         // Always keep disconnected cache in sync with server
@@ -1335 +1342 @@
                 // Always fall back to writing entire calendar
                 WriteFullCalendar(node, cal);
+                Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
                 return;
         }
@@ -1353 +1361 @@
                 node.SyncNow();
         }
+
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1362 +1372 @@
                 // Always fall back to writing entire calendar
                 WriteFullCalendar(node, cal);
+                Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
                 return;
         }
@@ -1380 +1391 @@
                 node.SyncNow();
         }
+
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1389 +1402 @@
                 // Always fall back to writing entire calendar
                 WriteFullCalendar(node, cal);
+                Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
                 return;
         }
@@ -1407 +1421 @@
                 node.SyncNow();
         }
+
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1416 +1432 @@
                 // Always fall back to writing entire calendar
                 WriteFullCalendar(node, cal);
+                Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
                 return;
         }
@@ -1434 +1451 @@
                 node.SyncNow();
         }
+
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 
@@ -1458 +1477 @@
                 DumpCalendars();
         }
+
+        Broadcast_Message(eBroadcast_RefreshNode, (void*)&node);
 }
 

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

@@ -171 +171 @@
         void CopyCalendarContents(const CCalendarStoreNode& node, iCal::CICalendar& newcal);
 
-        void ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
+        void ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed=false);
         void WriteFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);