[CalendarServer-changes] [5899] CalendarServer/branches/new-store/twistedcaldav/resource.py

[source_changes at macosforge.org]

Revision: 5899
          http://trac.macosforge.org/projects/calendarserver/changeset/5899
Author:   cdaboo at apple.com
Date:     2010-07-14 09:32:38 -0700 (Wed, 14 Jul 2010)
Log Message:
-----------
Since we do not support regular collections anymore, skip them when doing depth:infinity collection
lookup. This also allows us to avoid scanning the dropbox home which is a very expensive operation
right now.

Modified Paths:
--------------
    CalendarServer/branches/new-store/twistedcaldav/resource.py

Modified: CalendarServer/branches/new-store/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/new-store/twistedcaldav/resource.py	2010-07-14 16:09:47 UTC (rev 5898)
+++ CalendarServer/branches/new-store/twistedcaldav/resource.py	2010-07-14 16:32:38 UTC (rev 5899)
@@ -882,11 +882,13 @@
         def gotChild(child, childpath):
             if child.isSpecialCollection(type):
                 callback(child, childpath)
-            elif child.isCollection():
-                if depth == "infinity":
-                    fc = child.findSpecialCollections(type, depth, request, callback, privileges)
-                    fc.addCallback(lambda x: reactor.callLater(0, getChild))
-                    return fc
+                
+            # No more regular collections
+            #elif child.isCollection():
+            #    if depth == "infinity":
+            #        fc = child.findSpecialCollections(type, depth, request, callback, privileges)
+            #        fc.addCallback(lambda x: reactor.callLater(0, getChild))
+            #        return fc
 
             reactor.callLater(0, getChild)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100714/e4ede6f4/attachment.html>