From: jlaine <jlaine@e071eeec-0327-468d-9b6a-08194a12b294>
Date: Tue, 1 Jun 2010 16:28:48 +0000 (+0000)
Subject: don't forget to use offset/limit in get_count()
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=commitdiff_plain;h=ccd4564cbcef786f10930f67f8f827e29725777f;hp=75d4446eb587e435537cc09499a1987a9e35b0f6

don't forget to use offset/limit in get_count()


git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@920 e071eeec-0327-468d-9b6a-08194a12b294
---

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 07a6312..3076e3f 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -211,7 +211,15 @@ class Query(BaseQuery):
             )
         except ldap.NO_SUCH_OBJECT:
             return 0
-        return len(vals)
+
+        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)