X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=e4226309af8cdbdf6728cef96803f9b17679e29e;hp=8999c17a4622d16654ad2bf25da77a9ddcc90111;hb=86f79b1135e0983d0a48e211685c57ce76ea09e0;hpb=5581ef499d94127504e076f540e71ef412fd88df

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 8999c17..e422630 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -113,7 +113,15 @@ 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):
                 if field.attname == 'dn':
@@ -123,6 +131,7 @@ class Compiler(object):
                 else:
                     row.append(None)
             yield row
+            pos += 1
 
 
 class WhereNode(BaseWhereNode):