[CalendarServer-changes] [1774] CalendarServer/branches/release/CalendarServer-1.0-dev

[source_changes at macosforge.org]

Revision: 1774
          http://trac.macosforge.org/projects/calendarserver/changeset/1774
Author:   wsanchez at apple.com
Date:     2007-08-08 16:55:30 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
Pulled up r1632 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/run
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/run
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/run	2007-08-08 21:18:50 UTC (rev 1773)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/run	2007-08-08 23:55:30 UTC (rev 1774)
@@ -480,7 +480,7 @@
   if ! py_have_module opendirectory; then
     opendirectory="${top}/PyOpenDirectory";
 
-    svn_get "PyOpenDirectory" "${opendirectory}" "${svn_uri_base}/PyOpenDirectory/trunk" 1534;
+    svn_get "PyOpenDirectory" "${opendirectory}" "${svn_uri_base}/PyOpenDirectory/trunk" 1631;
     py_build "PyOpenDirectory" "${opendirectory}" false;
     py_install "PyOpenDirectory" "${opendirectory}";
 

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-08 21:18:50 UTC (rev 1773)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-08 23:55:30 UTC (rev 1774)
@@ -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:

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