[CalendarServer-changes] [14546] CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 14546
          http://trac.calendarserver.org//changeset/14546
Author:   sagen at apple.com
Date:     2015-03-09 20:35:16 -0700 (Mon, 09 Mar 2015)
Log Message:
-----------
CardDAV home._children needs to be multi-level to match Common

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py

Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py	2015-03-10 02:34:41 UTC (rev 14545)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py	2015-03-10 03:35:16 UTC (rev 14546)
@@ -436,13 +436,13 @@
             if 0 == previouslyAcceptedCount:
                 yield self._initSyncToken()
                 yield self._initBindRevision()
-                self._home._children[self._name] = self
-                self._home._children[self._resourceID] = self
+                self._home._children[self._home._childrenKey(False)][self._name] = self
+                self._home._children[self._home._childrenKey(False)][self._resourceID] = self
         elif self._bindStatus == _BIND_STATUS_DECLINED:
             if 1 == previouslyAcceptedCount:
                 yield self._deletedSyncToken(sharedRemoval=True)
-                self._home._children.pop(self._name, None)
-                self._home._children.pop(self._resourceID, None)
+                self._home._children[self._home._childrenKey(False)].pop(self._name, None)
+                self._home._children[self._home._childrenKey(False)].pop(self._resourceID, None)
 
 
 
@@ -1717,14 +1717,14 @@
                 if shareeView._bindStatus == _BIND_STATUS_ACCEPTED:
                     if 0 == previouslyAcceptedBindCount:
                         yield shareeView.addressbook()._initSyncToken()
-                        shareeView.viewerHome()._children[self.addressbook().ownerHome().uid()] = shareeView.addressbook()
-                        shareeView.viewerHome()._children[shareeView._resourceID] = shareeView.addressbook()
+                        shareeView.viewerHome()._children[self._home._childrenKey(False)][self.addressbook().ownerHome().uid()] = shareeView.addressbook()
+                        shareeView.viewerHome()._children[self._home._childrenKey(False)][shareeView._resourceID] = shareeView.addressbook()
                     yield shareeView._initBindRevision()
                 elif shareeView._bindStatus == _BIND_STATUS_DECLINED:
                     if 1 == previouslyAcceptedBindCount:
                         yield shareeView.addressbook()._deletedSyncToken(sharedRemoval=True)
-                        shareeView.viewerHome()._children.pop(self.addressbook().ownerHome().uid(), None)
-                        shareeView.viewerHome()._children.pop(shareeView._resourceID, None)
+                        shareeView.viewerHome()._children[self._home._childrenKey(False)].pop(self.addressbook().ownerHome().uid(), None)
+                        shareeView.viewerHome()._children[self._home._childrenKey(False)].pop(shareeView._resourceID, None)
                     else:
                         # update revision in all remaining bind table rows for this address book
                         yield shareeView.addressbook().notifyPropertyChanged()
@@ -1777,8 +1777,8 @@
             acceptedBindCount += len(groupBindRows)
             if acceptedBindCount == 1:
                 yield addressbookAsShared._deletedSyncToken(sharedRemoval=True)
-                shareeHome._children.pop(self.ownerHome().uid(), None)
-                shareeHome._children.pop(addressbookAsShared._resourceID, None)
+                shareeHome._children[self._home._childrenKey(False)].pop(self.ownerHome().uid(), None)
+                shareeHome._children[self._home._childrenKey(False)].pop(addressbookAsShared._resourceID, None)
             else:
                 yield addressbookAsShared.notifyPropertyChanged()
                 # update revision in all remaining bind table rows for this address book
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150309/acdf8e12/attachment-0001.html>