[CalendarServer-changes] [7066] CalendarServer/trunk/txdav/caldav/datastore
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 21 19:16:05 PST 2011
Revision: 7066
http://trac.macosforge.org/projects/calendarserver/changeset/7066
Author: cdaboo at apple.com
Date: 2011-02-21 19:16:05 -0800 (Mon, 21 Feb 2011)
Log Message:
-----------
Migrate the calendar object "metadata".
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/file.py
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/caldav/datastore/util.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py 2011-02-22 02:05:54 UTC (rev 7065)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py 2011-02-22 03:16:05 UTC (rev 7066)
@@ -405,6 +405,15 @@
def organizer(self):
return self.component().getOrganizer()
+ def getMetadata(self):
+ metadata = {}
+ metadata["accessMode"] = self.accessMode
+ metadata["isScheduleObject"] = self.isScheduleObject
+ metadata["scheduleTag"] = self.scheduleTag
+ metadata["scheduleEtags"] = self.scheduleEtags
+ metadata["hasPrivateComment"] = self.hasPrivateComment
+ return metadata
+
def _get_accessMode(self):
return str(self.properties().get(PropertyName.fromElement(customxml.TwistedCalendarAccessProperty), ""))
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2011-02-22 02:05:54 UTC (rev 7065)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2011-02-22 03:16:05 UTC (rev 7066)
@@ -603,6 +603,15 @@
returnValue((yield self.component()).getOrganizer())
+ def getMetadata(self):
+ metadata = {}
+ metadata["accessMode"] = self.accessMode
+ metadata["isScheduleObject"] = self.isScheduleObject
+ metadata["scheduleTag"] = self.scheduleTag
+ metadata["scheduleEtags"] = self.scheduleEtags
+ metadata["hasPrivateComment"] = self.hasPrivateComment
+ return metadata
+
def _get_accessMode(self):
return accesstype_to_accessMode[self._access]
Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py 2011-02-22 02:05:54 UTC (rev 7065)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py 2011-02-22 03:16:05 UTC (rev 7066)
@@ -127,7 +127,9 @@
try:
yield outCalendar.createCalendarObjectWithName(
calendarObject.name(),
- (yield calendarObject.component())) # XXX WRONG SHOULD CALL getComponent
+ (yield calendarObject.component()), # XXX WRONG SHOULD CALL getComponent
+ metadata=calendarObject.getMetadata(),
+ )
# Only the owner's properties are migrated, since previous releases of
# calendar server didn't have per-user properties.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110221/da5aa7c8/attachment-0001.html>
More information about the calendarserver-changes
mailing list