query = self.query
attrlist = [ x.db_column for x in query.model._meta.local_fields if x.db_column ]
- vals = self.connection.search_s(
- query.model.base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=query._ldap_filter(),
- attrlist=attrlist,
- )
+ try:
+ vals = self.connection.search_s(
+ query.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=query._ldap_filter(),
+ attrlist=attrlist,
+ )
+ except ldap.NO_SUCH_OBJECT:
+ return
+ raise query.model.DoesNotExist
# perform sorting
if query.extra_order_by:
vals = sorted(vals, cmp=cmpvals)
# process results
+ pos = 0
for dn, attrs in vals:
+ # FIXME : This is not optimal, we retrieve more results than we need
+ # but there is probably no other options as we can't perform ordering
+ # server side.
+ if (self.query.low_mark and pos < self.query.low_mark) or \
+ (self.query.high_mark is not None and pos >= self.query.high_mark):
+ pos += 1
+ continue
row = []
for field in iter(query.model._meta.fields):
if field.attname == 'dn':
else:
row.append(None)
yield row
+ pos += 1
class WhereNode(BaseWhereNode):
return '(&%s)' % filterstr
def get_count(self, using=None):
- vals = ldapdb.connection.search_s(
- self.model.base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=self._ldap_filter(),
- attrlist=[],
- )
+ try:
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=self._ldap_filter(),
+ attrlist=[],
+ )
+ except ldap.NO_SUCH_OBJECT:
+ return 0
return len(vals)
def get_compiler(self, using=None, connection=None):
def delete(self):
"Bulk deletion."
- vals = ldapdb.connection.search_s(
- self.model.base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=self.query._ldap_filter(),
- attrlist=[],
- )
+ try:
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=self.query._ldap_filter(),
+ attrlist=[],
+ )
+ except ldap.NO_SUCH_OBJECT:
+ return
+
# FIXME : there is probably a more efficient way to do this
for dn, attrs in vals:
ldapdb.connection.delete_s(dn)