Revision: 1596 http://trac.macosforge.org/projects/calendarserver/changeset/1596 Author: cdaboo@apple.com Date: 2007-06-07 10:09:37 -0700 (Thu, 07 Jun 2007) Log Message: ----------- Wrong attribute for record name. Minor clean-up. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-06-07 02:25:31 UTC (rev 1595) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-06-07 17:09:37 UTC (rev 1596) @@ -412,13 +412,13 @@ if self.requireComputerRecord: subquery = dsquery.match(dsattributes.kDSNAttrServicesLocator, self.servicetag, dsattributes.eDSStartsWith) - if query: + if query is None: + query = subquery + else: query = dsquery.expression(dsquery.expression.AND, (subquery, query)) - else: - query = subquery if shortName is not None: - subquery = dsquery.match(dsattributes.kDSNAttrResourceType, shortName, dsattributes.eDSExact) + subquery = dsquery.match(dsattributes.kDSNAttrRecordName, shortName, dsattributes.eDSExact) if query is None: query = subquery else: