[CalendarServer-changes] [1631]

[source_changes at macosforge.org]

Revision: 1631
          http://trac.macosforge.org/projects/calendarserver/changeset/1631
Author:   cdaboo at apple.com
Date:     2007-06-28 19:53:04 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
Schema has changed so that location are now in /Places records and the ResourceType attribute is no
longer significant.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    PyOpenDirectory/trunk/pysrc/dsattributes.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-06-29 02:51:13 UTC (rev 1630)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-06-29 02:53:04 UTC (rev 1631)
@@ -409,19 +409,11 @@
             attrs.append(dsattributes.kDSNAttrGroupMembers)
 
         elif recordType == DirectoryService.recordType_locations:
-            listRecordType = dsattributes.kDSStdRecordTypeResources
-            query = dsquery.match(dsattributes.kDSNAttrResourceType, "1", dsattributes.eDSExact)
+            listRecordType = dsattributes.kDSStdRecordTypePlaces
             attrs.append(dsattributes.kDSNAttrResourceInfo)
         
         elif recordType == DirectoryService.recordType_resources:
             listRecordType = dsattributes.kDSStdRecordTypeResources
-            query = dsquery.expression(dsquery.expression.OR, (
-                dsquery.match(dsattributes.kDSNAttrResourceType, "0", dsattributes.eDSExact),
-                dsquery.match(dsattributes.kDSNAttrResourceType, "2", dsattributes.eDSExact),
-                dsquery.match(dsattributes.kDSNAttrResourceType, "3", dsattributes.eDSExact),
-                dsquery.match(dsattributes.kDSNAttrResourceType, "4", dsattributes.eDSExact),
-                dsquery.match(dsattributes.kDSNAttrResourceType, "5", dsattributes.eDSExact),
-            ))
             attrs.append(dsattributes.kDSNAttrResourceInfo)
         
         else:

Modified: PyOpenDirectory/trunk/pysrc/dsattributes.py
===================================================================
--- PyOpenDirectory/trunk/pysrc/dsattributes.py	2007-06-29 02:51:13 UTC (rev 1630)
+++ PyOpenDirectory/trunk/pysrc/dsattributes.py	2007-06-29 02:53:04 UTC (rev 1631)
@@ -185,6 +185,12 @@
 kDSStdRecordTypeMachines = "dsRecTypeStandard:Machines"
 
 """
+ kDSStdRecordTypeMaps
+  Identifies map records.
+"""
+kDSStdRecordTypeMaps = "dsRecTypeStandard:Maps"
+
+"""
  kDSStdRecordTypeMeta
   Identifies meta records.
 """
@@ -246,6 +252,12 @@
 kDSStdRecordTypePeople = "dsRecTypeStandard:People"
 
 """
+ kDSStdRecordTypePlaces
+  Identifies places (rooms) records.
+"""
+kDSStdRecordTypePlaces = "dsRecTypeStandard:Places"
+
+"""
  kDSStdRecordTypePresetComputers
   The computer record type used for presets in record creation.
 """

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070628/77cf778d/attachment.html