[CalendarServer-changes] [563] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ directory/sqldb.py

[source_changes at macosforge.org]

Revision: 563
          http://trac.macosforge.org/projects/calendarserver/changeset/563
Author:   cdaboo at apple.com
Date:     2006-11-22 14:06:22 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Return CU addresses in directory record.

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

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py	2006-11-22 21:59:11 UTC (rev 562)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py	2006-11-22 22:06:22 UTC (rev 563)
@@ -81,7 +81,6 @@
        self._db_commit()
 
     def listRecords(self, recordType):
-        return self._db_values_for_sql("select UID from ACCOUNTS where TYPE = :1", recordType)
         # Get each account record
         rowiter = self._db_execute("select UID, PSWD, NAME from ACCOUNTS where TYPE = :1", recordType)
         for row in rowiter:
@@ -90,6 +89,7 @@
             name = row[2]
             members = []
             groups = []
+            cuaddrs = []
     
             # See if we have a group
             if recordType == "group":
@@ -102,7 +102,12 @@
             for row in rowiter:
                 groups.append(row[0])
                 
-            yield uid, pswd, name, members, groups
+            # Get calendar user addresses
+            rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
+            for row in rowiter:
+                cuaddrs.append(row[0])
+                
+            yield uid, pswd, name, members, groups, cuaddrs
 
     def getRecord(self, recordType, uid):
         # Get individual account record
@@ -122,6 +127,7 @@
         name = result[2]
         members = []
         groups = []
+        cuaddrs = []
 
         # See if we have a group
         if recordType == "group":
@@ -134,8 +140,13 @@
         for row in rowiter:
             groups.append(row[0])
             
-        return uid, pswd, name, members, groups
+        # Get calendar user addresses
+        rowiter = self._db_execute("select CUADDR from CUADDRS where UID = :1", uid)
+        for row in rowiter:
+            cuaddrs.append(row[0])
             
+        return uid, pswd, name, members, groups, cuaddrs
+            
     def _add_to_db(self, record):
         # Do regular account entry
         type = record.recordType
@@ -261,6 +272,7 @@
                 name          = result[2],
                 members       = result[3],
                 groups        = result[4],
+                cuaddrs       = result[5],
             )
 
     def recordWithShortName(self, recordType, shortName):
@@ -274,6 +286,7 @@
                 name          = result[2],
                 members       = result[3],
                 groups        = result[4],
+                cuaddrs       = result[5],
             )
 
         return None
@@ -285,13 +298,14 @@
     """
     XML based implementation implementation of L{IDirectoryRecord}.
     """
-    def __init__(self, service, recordType, shortName, pswd, name, members, groups):
+    def __init__(self, service, recordType, shortName, pswd, name, members, groups, cuaddrs):
         super(SQLDirectoryRecord, self).__init__(
             service    = service,
             recordType = recordType,
             guid       = None,
             shortName  = shortName,
             fullName   = name,
+            cuaddrs    = cuaddrs,
         )
 
         self.password = pswd

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061122/5b218b52/attachment.html