Changeset 160

Timestamp:

02/03/08 20:17:26 (10 months ago)

Author:

cyrusdaboo

Message:

Add check calendar command/toolbar button to do fast checks of all active/open calendars.

Location:

Mulberry/branches/v4.1d1

Files:

• MacOS/Resources/Mulberry.PPob (modified) (previous)
• MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.cp (modified) (2 diffs)
• MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.h (modified) (1 diff)
• MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.cp (modified) (2 diffs)
• MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.h (modified) (1 diff)
• MacOS/Sources/Application/General/CCommands.h (modified) (1 diff)
• Sources_Common/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTableCommon.cp (modified) (1 diff)
• Sources_Common/Application/Calendar/Calendar_View/Calendar_Window/CCalendarViewCommon.cp (modified) (1 diff)
• Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp (modified) (8 diffs)
• Sources_Common/Support/Toolbars/CToolbarManager.cp (modified) (6 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.cp

@@ -177 +177 @@
                 break;
 
+        case cmd_CheckCalendar:
+        case cmd_ToolbarCheckMailboxBtn:
+                OnCheckCalendar();
+                break;
+
         case cmd_RefreshCalendarList:
                 OnRefreshList();
@@ -326 +331 @@
         case cmd_FreeBusyCalendar:
         case cmd_SendCalendar:
-                // Only if calendar selection;
+                // Only if calendar selection
                 outEnabled = TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCanChangeCalendar);
                 break;
 
+        case cmd_CheckCalendar:
+        case cmd_ToolbarCheckMailboxBtn:
+                // Always enabled
+                outEnabled = true;
+                break;
+
         case cmd_RefreshCalendarList:
-                // Only if single selection;
+                // Only if single selection
                 outEnabled = IsSingleSelection();
                 break;

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.h

@@ -134 +134 @@
                         bool            RenameCalendar(TableIndexT row);
                         void            OnDeleteCalendar();
+                        void            OnCheckCalendar();
+                        bool            CheckCalendar(TableIndexT row);
                         void            OnRefreshList();
                         void            OnFreeBusyCalendar();

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.cp

@@ -211 +211 @@
                 break;
 
+        case cmd_CheckCalendar:
+        case cmd_ToolbarCheckMailboxBtn:
+                OnCheckCalendar();
+                break;
+
         default:
                 cmdHandled = CBaseView::ObeyCommand(inCommand, ioParam);
@@ -306 +311 @@
         case cmd_ToolbarShowTodayBtn:
                 mCurrentView->GetTable()->FindCommandStatus(inCommand, outEnabled, outUsesMark, outMark, outName);
+                break;
+
+        case cmd_CheckCalendar:
+        case cmd_ToolbarCheckMailboxBtn:
+                // Always enabled
+                outEnabled = true;
                 break;
 

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.h

@@ -175 +175 @@
                         void            OnFileSave();
 
+                        void            OnCheckCalendar();
+
 private:
         bool mIgnoreValueFieldChanged;

Mulberry/branches/v4.1d1/MacOS/Sources/Application/General/CCommands.h

@@ -422 +422 @@
 const   CommandT        cmd_UploadWebCalendar = 9512;
 const   CommandT        cmd_FreeBusyCalendar = 9513;
+const   CommandT        cmd_CheckCalendar = 9514;
 
 // Calendar Window

Mulberry/branches/v4.1d1/Sources_Common/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTableCommon.cp

@@ -834 +834 @@
 }
 
+void CCalendarStoreTable::OnCheckCalendar()
+{
+        // If no selection, check all subscribed calendars
+        if (!IsSelectionValid())
+        {
+                const iCal::CICalendarList& cals = calstore::CCalendarStoreManager::sCalendarStoreManager->GetSubscribedCalendars();
+                for(iCal::CICalendarList::const_iterator iter = cals.begin(); iter != cals.end(); iter++)
+                {
+                        calstore::CCalendarStoreNode* node = const_cast<calstore::CCalendarStoreNode*>(calstore::CCalendarStoreManager::sCalendarStoreManager->GetNode(*iter));
+                        node->GetProtocol()->CheckCalendar(*node, *node->GetCalendar());
+                }
+        }
+        else
+        {
+                DoToSelection((DoToSelectionPP) &CCalendarStoreTable::CheckCalendar);
+        }
+
+        // Reset all views
+        CCalendarView::ResetAll();
+}
+
+bool CCalendarStoreTable::CheckCalendar(TableIndexT row)
+{
+        // Get calendar for hit cell
+        calstore::CCalendarStoreNode* node = GetCellNode(row);
+
+        // Only do those that are active calendars
+        if ((node == NULL) || !node->IsViewableCalendar() || !node->IsActive())
+                return false;
+
+        if (node->GetCalendar() != NULL)
+                return node->GetProtocol()->CheckCalendar(*node, *node->GetCalendar());
+                
+        return false;
+}
+
 void CCalendarStoreTable::OnRefreshList()
 {

Mulberry/branches/v4.1d1/Sources_Common/Application/Calendar/Calendar_View/Calendar_Window/CCalendarViewCommon.cp

@@ -318 +318 @@
 }
 
+void CCalendarView::OnCheckCalendar()
+{
+        // If no selection, check all subscribed calendars
+        if (mSingleCalendar)
+        {
+                calstore::CCalendarStoreNode* node = const_cast<calstore::CCalendarStoreNode*>(calstore::CCalendarStoreManager::sCalendarStoreManager->GetNode(GetCalendar()));
+                node->GetProtocol()->CheckCalendar(*node, *node->GetCalendar());
+        }
+        else
+        {
+                const iCal::CICalendarList& cals = calstore::CCalendarStoreManager::sCalendarStoreManager->GetSubscribedCalendars();
+                for(iCal::CICalendarList::const_iterator iter = cals.begin(); iter != cals.end(); iter++)
+                {
+                        calstore::CCalendarStoreNode* node = const_cast<calstore::CCalendarStoreNode*>(calstore::CCalendarStoreManager::sCalendarStoreManager->GetNode(*iter));
+                        node->GetProtocol()->CheckCalendar(*node, *node->GetCalendar());
+                }
+        }
+
+        // Reset all views
+        CCalendarView::ResetAll();
+}

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

@@ -813 +813 @@
 bool CCalendarProtocol::CheckCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal)
 {
-        bool result = mClient->_CheckCalendar(node, cal);
-        
-        // Always keep disconnected cache in sync with server
-        if (result && (mCacheClient != NULL))
-        {
-                // If cache does not exist, create it
-                if (!mCacheClient->_TestCalendar(node))
-                {
-                        mCacheClient->_CreateCalendar(node);
-                        mCacheClient->_WriteFullCalendar(node, cal);
+        bool result = false;
+
+        // See if offline or disconnected       
+        if (IsOffline() || IsDisconnected())
+        {
+                // Nothing to do here. We will assume that local files are always
+                // up to date.
+        }
+        else
+        {
+                // Look for local cache first
+                if ((mCacheClient != NULL) && !mCacheIsPrimary)
+                {
+                        // Read in the calendar cache if it exists
+                        if (mCacheClient->_TestCalendar(node))
+                                mCacheClient->_ReadFullCalendar(node, cal);
+
+                        // Sync cache with server doing playback if needed
+                        SyncFromServer(node, cal);
                 }
                 else
                 {
-                        // Get temp copy of cached calendar
-                        iCal::CICalendar temp;
-                        mCacheClient->_ReadFullCalendar(node, temp);
-                        
-                        // Sync changes in cache
-                        bool server_changed = false;
-                        if (temp.GetETag() == cal.GetETag())
-                        {
-                                if (temp.NeedsSync())
-                                {
-                                        // Local overwrites server
-                                        cal.Clear();
-                                        mCacheClient->_ReadFullCalendar(node, cal);
-                                        cal.ClearRecording();
-                                        server_changed = true;
-                                }
-                        }
-                        else
-                        {
-                                if (!temp.NeedsSync())
-                                {
-                                        // Server overwrites local - nothing to do just fall through to write
-                                }
-                                else
-                                {
-                                        // Sync the two
-                                        iCal::CICalendarSync sync(temp, cal);
-                                        sync.Sync();
-                                        
-                                        // Local overwrites server
-                                        cal.Clear();
-                                        mCacheClient->_ReadFullCalendar(node, cal);
-                                        cal.ClearRecording();
-                                }
-                        }
-
-                        // Update the server if needed
-                        if (server_changed)
-                        {
-                                mClient->_WriteFullCalendar(node, cal);
-                        }
-
-                        // Now write out the new cache data, this will overwrite any recorded
-                        // changes that have been sync'd so they will not be sync'd again
-                        mCacheClient->_WriteFullCalendar(node, cal);
-                }
-        }
-        
+                        // Just read full calendar from server
+                        result = mClient->_CalendarChanged(node, cal);
+                        if (result)
+                                ReadFullCalendar(node, cal);
+                }
+        }
+
         return result;
 }
@@ -1041 +1009 @@
                 cdstrmap comps;
                 bool server_changed = mClient->_CalendarChanged(node, cal);
+                bool changes_made = false;
                 if (server_changed)
                         mClient->_GetComponentInfo(node, cal, comps);
@@ -1062 +1031 @@
                                         // Add component to server
                                         mClient->_AddComponent(node, cal, *comp);
+                                        changes_made = true;
 
                                         // Add to added cache
@@ -1076 +1046 @@
                                         // Remove component from server
                                         mClient->_RemoveComponent(node, cal, (*iter).second.GetRURL());
+                                        changes_made = true;
                                         
                                         // Remove from server component info
@@ -1092 +1063 @@
                                         const iCal::CICalendarComponent* comp = cal.GetComponentByKey((*iter).first);
                                         mClient->_ChangeComponent(node, cal, *comp);
+                                        changes_made = true;
                                         cache_changed.insert(cdstrmap::value_type((*iter).second.GetRURL(), (*iter).second.GetETag()));
                                 }
@@ -1147 +1119 @@
                                                 // Write changed cache component to server
                                                 mClient->_ChangeComponent(node, cal, *cache_comp);
+                                                changes_made = true;
                                         }
                                         
@@ -1165 +1138 @@
                                                                 // Cache is newer than server - cache overwrites to server
                                                                 mClient->_ChangeComponent(node, cal, *cache_comp);
+                                                                changes_made = true;
                                                         }
                                                         else if (result == -1)
@@ -1230 +1204 @@
                 cal.ClearRecording();
                 
-                // Get the current server sync token
-                mClient->_UpdateSyncToken(node, cal);
+                // Get the current server sync token if changes were made or it was differemt
+                if (server_changed || changes_made)
+                        mClient->_UpdateSyncToken(node, cal);
 
                 // Now write back cache

Mulberry/branches/v4.1d1/Sources_Common/Support/Toolbars/CToolbarManager.cp

@@ -432 +432 @@
         CToolbarManager::eToolbar_CalendarSummary,
         CToolbarManager::eToolbar_CalendarToDo,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_Details,
         CToolbarManager::eToolbar_Print,
@@ -599 +600 @@
         CToolbarManager::eToolbar_Login,
         CToolbarManager::eToolbar_NewCalendar,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_Details,
         CToolbarManager::eToolbar_Print,
@@ -622 +624 @@
         CToolbarManager::eToolbar_CalendarSummary,
         CToolbarManager::eToolbar_CalendarToDo,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_Details,
         CToolbarManager::eToolbar_Print,
@@ -713 +716 @@
         CToolbarManager::eToolbar_CalendarToDo,
         CToolbarManager::eToolbar_Separator,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_ShowToday,
         CToolbarManager::eToolbar_GoToDate,
@@ -845 +849 @@
         CToolbarManager::eToolbar_Login,
         CToolbarManager::eToolbar_NewCalendar,
+        CToolbarManager::eToolbar_Separator,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_Separator,
         CToolbarManager::eToolbar_Details,
@@ -866 +872 @@
         CToolbarManager::eToolbar_CalendarToDo,
         CToolbarManager::eToolbar_Separator,
+        CToolbarManager::eToolbar_Check,
         CToolbarManager::eToolbar_ShowToday,
         CToolbarManager::eToolbar_GoToDate,