X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=3076e3f3364905bf2a272be6ad31934641cde093;hp=4f0273cc2ed6478f7fcd78897251cd1732bb932d;hb=ccd4564cbcef786f10930f67f8f827e29725777f;hpb=4abdee082b2cb5697cf0e6436df871a36cccdbe6

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 4f0273c..3076e3f 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -70,23 +70,30 @@ class Compiler(object):
         self.using = using
 
     def results_iter(self):
-        query = self.query
-        attrlist = [ x.db_column for x in query.model._meta.local_fields if x.db_column ]
+        if self.query.select_fields:
+            fields = self.query.select_fields
+        else:
+            fields = self.query.model._meta.fields
+
+        attrlist = [ x.db_column for x in 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(
+                self.query.model.base_dn,
+                ldap.SCOPE_SUBTREE,
+                filterstr=self.query._ldap_filter(),
+                attrlist=attrlist,
+            )
+        except ldap.NO_SUCH_OBJECT:
+            return
 
         # perform sorting
-        if query.extra_order_by:
-            ordering = query.extra_order_by
-        elif not query.default_ordering:
-            ordering = query.order_by
+        if self.query.extra_order_by:
+            ordering = self.query.extra_order_by
+        elif not self.query.default_ordering:
+            ordering = self.query.order_by
         else:
-            ordering = query.order_by or query.model._meta.ordering
+            ordering = self.query.order_by or self.query.model._meta.ordering
         def cmpvals(x, y):
             for fieldname in ordering:
                 if fieldname.startswith('-'):
@@ -94,7 +101,7 @@ class Compiler(object):
                     negate = True
                 else:
                     negate = False
-                field = query.model._meta.get_field(fieldname)
+                field = self.query.model._meta.get_field(fieldname)
                 attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection)
                 attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection)
                 # perform case insensitive comparison
@@ -109,9 +116,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'):
@@ -119,6 +134,7 @@ class Compiler(object):
                 else:
                     row.append(None)
             yield row
+            pos += 1
 
 
 class WhereNode(BaseWhereNode):
@@ -186,13 +202,24 @@ class Query(BaseQuery):
         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=[],
-        )
-        return len(vals)
+        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
+
+        number = len(vals)
+
+        # apply limit and offset
+        number = max(0, number - self.low_mark)
+        if self.high_mark is not None:
+            number = min(number, self.high_mark - self.low_mark)
+
+        return number
 
     def get_compiler(self, using=None, connection=None):
         return Compiler(self, ldapdb.connection, using)
@@ -216,12 +243,16 @@ class QuerySet(BaseQuerySet):
 
     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)