X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=07a6312bc182f2e6d3cb240f8198b204758df9e8;hp=8999c17a4622d16654ad2bf25da77a9ddcc90111;hb=63acf2102a20f6dacb548676a7099edc25b2cc71;hpb=1586dbefbbebc802312bccfe946fae20febeaf5a

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 8999c17..07a6312 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -70,27 +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 ]
 
         try:
             vals = self.connection.search_s(
-                query.model.base_dn,
+                self.query.model.base_dn,
                 ldap.SCOPE_SUBTREE,
-                filterstr=query._ldap_filter(),
+                filterstr=self.query._ldap_filter(),
                 attrlist=attrlist,
             )
         except ldap.NO_SUCH_OBJECT:
             return
-            raise query.model.DoesNotExist
 
         # 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('-'):
@@ -98,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
@@ -113,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'):
@@ -123,6 +134,7 @@ class Compiler(object):
                 else:
                     row.append(None)
             yield row
+            pos += 1
 
 
 class WhereNode(BaseWhereNode):