catch ldap.NO_SUCH_OBJECT for calls to ldap.search_s

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / query.py

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index f433956d52071c5bdac9f71a842dcf565449193f..8999c17a4622d16654ad2bf25da77a9ddcc90111 100644 (file)
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -71,21 +71,17 @@ class Compiler(object):
 
     def results_iter(self):
         query = self.query
-
-        filterstr = ''.join(['(objectClass=%s)' % cls for cls in query.model.object_classes])
-        sql, params = query.where.as_sql()
-        filterstr += sql
-        filterstr = '(&%s)' % filterstr
         attrlist = [ x.db_column for x in query.model._meta.local_fields if x.db_column ]
 
         try:
             vals = self.connection.search_s(
                 query.model.base_dn,
                 ldap.SCOPE_SUBTREE,
-                filterstr=filterstr,
+                filterstr=query._ldap_filter(),
                 attrlist=attrlist,
             )
-        except:
+        except ldap.NO_SUCH_OBJECT:
+            return
             raise query.model.DoesNotExist
 
         # perform sorting
@@ -187,22 +183,22 @@ class Query(BaseQuery):
         super(Query, self).__init__(*args, **kwargs)
         self.connection = ldapdb.connection
 
-    def get_count(self, using=None):
+    def _ldap_filter(self):
         filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
         sql, params = self.where.as_sql()
         filterstr += sql
-        filterstr = '(&%s)' % filterstr
+        return '(&%s)' % filterstr
 
+    def get_count(self, using=None):
         try:
-            vals = self.connection.search_s(
+            vals = ldapdb.connection.search_s(
                 self.model.base_dn,
                 ldap.SCOPE_SUBTREE,
-                filterstr=filterstr,
+                filterstr=self._ldap_filter(),
                 attrlist=[],
             )
-        except:
-            raise self.model.DoesNotExist
-
+        except ldap.NO_SUCH_OBJECT:
+            return 0
         return len(vals)
 
     def get_compiler(self, using=None, connection=None):
@@ -225,3 +221,19 @@ class QuerySet(BaseQuerySet):
                 query = Query(model, None, WhereNode)
         super(QuerySet, self).__init__(model=model, query=query)
 
+    def delete(self):
+        "Bulk deletion."
+        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)
+