X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=a3a960886050664ae035384e3a9a9d10ac986043;hb=afb1ad6158bb93a786db69c67d8d6260144f40c3;hp=b53d9591d73c54a2a187d92cc74b0fc5949c2c97;hpb=20e2c869ddee0fc85878c94c60512040b5c563ab;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index b53d959..a3a9608 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# -*- coding: utf-8 -*-
-
 from copy import deepcopy
 import ldap
 
@@ -43,10 +41,15 @@ class WhereNode(BaseWhereNode):
             else:
                 # django 1.0
                 table, column, type, x, y, values = item
+            equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
+            if len(equal_bits) == 1:
+                clause = equal_bits[0]
+            else:
+                clause = '(|%s)' % ''.join(equal_bits)
             if self.negated:
-                bits.append('(!(%s=%s))' % (column,values[0]))
+                bits.append('(!%s)' % clause)
             else:
-                bits.append('(%s=%s)' % (column,values[0]))
+                bits.append(clause)
         if len(bits) == 1:
             return bits[0]
         elif self.connector == AND:
@@ -59,14 +62,14 @@ class WhereNode(BaseWhereNode):
 class Query(BaseQuery):
     def results_iter(self):
         # FIXME: use all object classes
-        filterstr = '(objectClass=%s)' % self.model._meta.object_classes[0]
+        filterstr = '(objectClass=%s)' % self.model.object_classes[0]
         filterstr += self.where.as_sql()
         filterstr = '(&%s)' % filterstr
         attrlist = [ x.db_column for x in self.model._meta.local_fields if x.db_column ]
 
         try:
             vals = ldapdb.connection.search_s(
-                self.model._meta.dn,
+                self.model.base_dn,
                 ldap.SCOPE_SUBTREE,
                 filterstr=filterstr,
                 attrlist=attrlist,
@@ -85,7 +88,7 @@ class Query(BaseQuery):
             keys = []
             for k in ordering:
                 attr = self.model._meta.get_field(k).db_column
-                keys.append(x[1][attr])
+                keys.append(x[1].get(attr, '').lower())
             return keys
         vals = sorted(vals, key=lambda x: getkey(x))