[CalendarServer-changes] [442] CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/ directory/resource.py

[source_changes at macosforge.org]

Revision: 442
          http://trac.macosforge.org/projects/calendarserver/changeset/442
Author:   wsanchez at apple.com
Date:     2006-11-13 16:10:30 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Fix principal URL sent to super's __init__().
Use principal URL as calendar user address (again).

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py	2006-11-14 00:09:21 UTC (rev 441)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py	2006-11-14 00:10:30 UTC (rev 442)
@@ -153,7 +153,7 @@
     Directory principal resource.
     """
     def __init__(self, path, parent, record):
-        super(DirectoryPrincipalResource, self).__init__(path, parent.principalCollectionURL())
+        super(DirectoryPrincipalResource, self).__init__(path, joinURL(parent.principalCollectionURL(), record.shortName))
 
         self.record = record
         self._parent = parent
@@ -188,6 +188,7 @@
             "Full name: %(fullName)s\n"
             % self.record.__dict__,
             "Principal UID: %s\n" % self.principalUID(),
+            "Principal URL: %s\n" % self.principalURL(),
             "\nAlternate URIs:\n"         , format_list(self.alternateURIs),
             "\nGroup members:\n"          , format_list(self.groupMembers),
             "\nGroup memberships:\n"      , format_list(self.groupMemberships),
@@ -260,5 +261,14 @@
 
     def calendarUserAddresses(self):
         return (
-            self.principalUID(),
+            self.principalURL(),
+
+            # Need to implement GUID->record lookup first
+            #"urn:uuid:%s" % (self.record.guid,)
+
+            # Need to add email attribute to records if we want this
+            #"mailto:%s" % (self.record.emailAddress)
+
+            # This one needs a valid scheme.  If we make up our own, need to check the RFC for character rules.
+            #"urn:calendarserver.macosforge.org:webdav:principal:%s:%s" % (self.record.recordType, self.record.shortName),
         )

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061113/7f706d9c/attachment.html