[CalendarServer-changes] [8962] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /method/report_addressbook_query.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 2 15:07:33 PDT 2012


Revision: 8962
          http://trac.macosforge.org/projects/calendarserver/changeset/8962
Author:   gaya at apple.com
Date:     2012-04-02 15:07:33 -0700 (Mon, 02 Apr 2012)
Log Message:
-----------
vCardResource -> vCardResult

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/method/report_addressbook_query.py

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/method/report_addressbook_query.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/method/report_addressbook_query.py	2012-04-02 21:42:32 UTC (rev 8961)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/method/report_addressbook_query.py	2012-04-02 22:07:33 UTC (rev 8962)
@@ -160,23 +160,23 @@
             """
             """
             results, limited[0] = (yield directoryBackedAddressBook.directory.doAddressBookQuery( addressBookFilter, query, max_number_of_results[0] ))
-            for vCardResource in results:
+            for vCardResult in results:
                 
                 # match against original filter
-                if filter.match((yield vCardResource.vCard())):
+                if filter.match((yield vCardResult.vCard())):
  
                     # Check size of results is within limit
                     checkMaxResults()
                    
                     try:
-                        yield report_common.responseForHref(request, responses, vCardResource.hRef(), vCardResource, propertiesForResource, query, vcard=(yield vCardResource.vCard()))
+                        yield report_common.responseForHref(request, responses, vCardResult.hRef(), vCardResult, propertiesForResource, query, vcard=(yield vCardResult.vCard()))
                     except ConcurrentModification:
                         # This can happen because of a race-condition between the
                         # time we determine which resources exist and the deletion
                         # of one of these resources in another request.  In this
                         # case, we ignore the now missing resource rather
                         # than raise an error for the entire report.
-                        log.err("Missing resource during sync: %s" % (vCardResource.hRef(),))
+                        log.err("Missing resource during sync: %s" % (vCardResult.hRef(),))
  
             
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120402/82e52562/attachment.html>


More information about the calendarserver-changes mailing list