[CalendarServer-changes] [10803] CalendarServer/branches/users/gaya/sharedgroups/txdav

[source_changes at macosforge.org]

Revision: 10803
          http://trac.calendarserver.org//changeset/10803
Author:   gaya at apple.com
Date:     2013-02-22 11:38:11 -0800 (Fri, 22 Feb 2013)
Log Message:
-----------
use childWithName() in stead of objectWithName() where possible

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-02-22 04:59:43 UTC (rev 10802)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-02-22 19:38:11 UTC (rev 10803)
@@ -642,7 +642,10 @@
                 ownerHomeID = yield cls.ownerHomeID(home._txn, resourceID)
                 ownerHome = yield home._txn.homeWithResourceID(home._homeType, ownerHomeID)
                 ownerAddressBook = yield ownerHome.addressbook()
-                returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=accepted)))
+                if accepted:
+                    returnValue((yield home.childWithName(ownerAddressBook.shareeABName())))
+                else:
+                    returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=False)))
 
         groupBindRows = yield AddressBookObject._bindForNameAndHomeID.on(
             home._txn, name=name, homeID=home._resourceID
@@ -656,10 +659,11 @@
                 ownerHomeID = yield cls.ownerHomeID(home._txn, ownerAddressBookID)
                 ownerHome = yield home._txn.homeWithResourceID(home._homeType, ownerHomeID)
                 ownerAddressBook = yield ownerHome.addressbook()
-                addressbook = yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=accepted)
                 if accepted:
+                    addressbook = yield home.childWithName(ownerAddressBook.shareeABName())
                     returnValue((yield addressbook.objectResourceWithID(resourceID)))
                 else:
+                    addressbook = yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=False)
                     returnValue((yield AddressBookObject.objectWithID(addressbook, resourceID))) # avoids object cache
 
         returnValue(None)
@@ -685,7 +689,10 @@
             ownerHomeID = yield cls.ownerHomeID(home._txn, resourceID)
             ownerHome = yield home._txn.homeWithResourceID(home._homeType, ownerHomeID)
             ownerAddressBook = yield ownerHome.addressbook()
-            returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=(bindStatus == _BIND_STATUS_ACCEPTED))))
+            if bindStatus == _BIND_STATUS_ACCEPTED:
+                returnValue((yield home.childWithName(ownerAddressBook.shareeABName())))
+            else:
+                returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=False)))
 
         groupBindRows = yield AddressBookObject._bindWithHomeIDAndAddressBookID.on(
                     home._txn, homeID=home._resourceID, addressbookID=resourceID
@@ -696,7 +703,10 @@
             ownerHomeID = yield cls.ownerHomeID(home._txn, ownerAddressBookID)
             ownerHome = yield home._txn.homeWithResourceID(home._homeType, ownerHomeID)
             ownerAddressBook = yield ownerHome.addressbook()
-            returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=(bindStatus == _BIND_STATUS_ACCEPTED))))
+            if bindStatus == _BIND_STATUS_ACCEPTED:
+                returnValue((yield home.childWithName(ownerAddressBook.shareeABName())))
+            else:
+                returnValue((yield cls.objectWithName(home, ownerAddressBook.shareeABName(), accepted=False)))
 
         returnValue(None)
 

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-02-22 04:59:43 UTC (rev 10802)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-02-22 19:38:11 UTC (rev 10803)
@@ -1653,7 +1653,7 @@
         @param name: a string.
         @return: an L{ICalendar} or C{None} if no such child exists.
         """
-        return self._childClass.objectWithName(self, shareUID, accepted=True)
+        return self.childWithName(shareUID)
 
 
     def invitedObjectWithShareUID(self, shareUID):
@@ -3117,7 +3117,10 @@
             home._txn, resourceID=resourceID, homeID=home._resourceID)
         if rows:
             bindMode, homeID, resourceID, resourceName, bindStatus, bindMessage = rows[0] #@UnusedVariable
-            returnValue((yield cls.objectWithName(home, resourceName, accepted=(bindStatus == _BIND_STATUS_ACCEPTED))))
+            if bindStatus == _BIND_STATUS_ACCEPTED:
+                returnValue((yield home.childWithName(resourceName)))
+            else:
+                returnValue((yield cls.objectWithName(home, resourceName, accepted=False)))
 
         returnValue(None)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130222/8ae72ef4/attachment-0001.html>