X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=e55c1610a2f2f46043d63f34ea74f505d90627f9;hp=5b7e6afdd40ff7d49aee800d30a59bbd75aeabe7;hb=f581bcb796907a374dc1210044600fb5792f6dfe;hpb=a215a2ba69e247e614fa4cffda46ced4e51706bb

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 5b7e6af..e55c161 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -71,21 +71,22 @@ class Compiler(object):
 
     def results_iter(self):
         query = self.query
+        if self.query.select_fields:
+            fields = self.query.select_fields
+        else:
+            fields = self.query.model._meta.fields
 
-        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 ]
+        attrlist = [ x.db_column for x in 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
@@ -117,9 +118,17 @@ class Compiler(object):
         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):
+            for field in iter(fields):
                 if field.attname == 'dn':
                     row.append(dn)
                 elif hasattr(field, 'from_ldap'):
@@ -127,6 +136,7 @@ class Compiler(object):
                 else:
                     row.append(None)
             yield row
+            pos += 1
 
 
 class WhereNode(BaseWhereNode):
@@ -187,22 +197,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 = 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 +235,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)
+