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

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index fc211b4..5b7e6af 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -96,15 +96,20 @@ class Compiler(object):
         else:
             ordering = query.order_by or query.model._meta.ordering
         def cmpvals(x, y):
-            for field in ordering:
-                if field.startswith('-'):
-                    field = field[1:]
+            for fieldname in ordering:
+                if fieldname.startswith('-'):
+                    fieldname = fieldname[1:]
                     negate = True
                 else:
                     negate = False
-                attr = query.model._meta.get_field(field).db_column
-                attr_x = x[1].get(attr, '').lower()
-                attr_y = y[1].get(attr, '').lower()
+                field = 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
+                if hasattr(attr_x, 'lower'):
+                    attr_x = attr_x.lower()
+                if hasattr(attr_y, 'lower'):
+                    attr_y = attr_y.lower()
                 val = negate and cmp(attr_y, attr_x) or cmp(attr_x, attr_y)
                 if val:
                     return val
@@ -182,14 +187,14 @@ class Query(BaseQuery):
         super(Query, self).__init__(*args, **kwargs)
         self.connection = ldapdb.connection
 
-    def get_count(self):
+    def get_count(self, using=None):
         filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
         sql, params = self.where.as_sql()
         filterstr += sql
         filterstr = '(&%s)' % filterstr
 
         try:
-            vals = self.connection.search_s(
+            vals = ldapdb.connection.search_s(
                 self.model.base_dn,
                 ldap.SCOPE_SUBTREE,
                 filterstr=filterstr,