[CalendarServer-changes] [6259] CalendarServer/trunk/txdav

[source_changes at macosforge.org]

Revision: 6259
          http://trac.macosforge.org/projects/calendarserver/changeset/6259
Author:   cdaboo at apple.com
Date:     2010-09-08 13:28:19 -0700 (Wed, 08 Sep 2010)
Log Message:
-----------
Use new API for generating notifications.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/file.py
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/carddav/datastore/file.py
    CalendarServer/trunk/txdav/carddav/datastore/sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py	2010-09-08 19:27:03 UTC (rev 6258)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py	2010-09-08 20:28:19 UTC (rev 6259)
@@ -263,9 +263,10 @@
                     self._path.remove()
             return undo
         self._transaction.addOperation(do, "set calendar component %r" % (self.name(),))
-        if self._calendar._notifier:
-            self._transaction.postCommit(self._calendar._notifier.notify)
 
+        self._calendar.notifyChanged()
+
+
     def component(self):
         if self._component is not None:
             return self._component

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2010-09-08 19:27:03 UTC (rev 6258)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2010-09-08 20:28:19 UTC (rev 6259)
@@ -235,8 +235,7 @@
         else:
             self._calendar._updateRevision(self._name)
 
-        if self._calendar._notifier:
-            self._txn.postCommit(self._calendar._notifier.notify)
+        self._calendar.notifyChanged()
 
     def updateDatabase(self, component, expand_until=None, reCreate=False, inserting=False):
         """

Modified: CalendarServer/trunk/txdav/carddav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/file.py	2010-09-08 19:27:03 UTC (rev 6258)
+++ CalendarServer/trunk/txdav/carddav/datastore/file.py	2010-09-08 20:28:19 UTC (rev 6259)
@@ -195,9 +195,8 @@
                     self._path.remove()
             return undo
         self._transaction.addOperation(do, "set addressbook component %r" % (self.name(),))
-        if self._addressbook._notifier:
-            self._transaction.postCommit(self._addressbook._notifier.notify)
 
+        self._addressbook.notifyChanged()
 
 
     def component(self):

Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py	2010-09-08 19:27:03 UTC (rev 6258)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py	2010-09-08 20:28:19 UTC (rev 6259)
@@ -161,8 +161,7 @@
         else:
             self._addressbook._updateRevision(self._name)
 
-        if self._addressbook._notifier:
-            self._addressbook._home._txn.postCommit(self._addressbook._notifier.notify)
+        self._addressbook.notifyChanged()
 
     def updateDatabase(self, component, expand_until=None, reCreate=False, inserting=False):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100908/2fa87aa4/attachment.html>