X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ldapdb%2Fmodels%2Ffields.py;h=ed1d3df798fd3ee0f6b4fce4fc93aacc40c0d5c1;hb=c04580563f978929bc4f06dfa85ea7a26248d688;hp=5e85062407847b2a7735ec0b83eece3c38c7a427;hpb=089876639ebce60a85a285d7ab076797fa96c20c;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/fields.py b/ldapdb/models/fields.py
index 5e85062..ed1d3df 100644
--- a/ldapdb/models/fields.py
+++ b/ldapdb/models/fields.py
@@ -27,13 +27,19 @@ class CharField(fields.CharField):
         kwargs['max_length'] = 200
         super(CharField, self).__init__(*args, **kwargs)
 
+    def from_ldap(self, value, connection):
+        if len(value) == 0:
+            return ''
+        else:
+            return value[0].decode(connection.charset)
+
     def get_db_prep_lookup(self, lookup_type, value):
         "Returns field's value prepared for database lookup."
         if lookup_type == 'endswith':
             return ["*%s" % escape_ldap_filter(value)]
         elif lookup_type == 'startswith':
             return ["%s*" % escape_ldap_filter(value)]
-        elif lookup_type == 'contains':
+        elif lookup_type in ['contains', 'icontains']:
             return ["*%s*" % escape_ldap_filter(value)]
         elif lookup_type == 'exact':
             return [escape_ldap_filter(value)]
@@ -42,13 +48,16 @@ class CharField(fields.CharField):
 
         raise TypeError("CharField has invalid lookup: %s" % lookup_type)
 
+    def get_db_prep_save(self, value, connection):
+        return [value.encode(connection.charset)]
+
     def get_prep_lookup(self, lookup_type, value):
         "Perform preliminary non-db specific lookup checks and conversions"
         if lookup_type == 'endswith':
             return "*%s" % escape_ldap_filter(value)
         elif lookup_type == 'startswith':
             return "%s*" % escape_ldap_filter(value)
-        elif lookup_type == 'contains':
+        elif lookup_type in ['contains', 'icontains']:
             return "*%s*" % escape_ldap_filter(value)
         elif lookup_type == 'exact':
             return escape_ldap_filter(value)
@@ -58,19 +67,37 @@ class CharField(fields.CharField):
         raise TypeError("CharField has invalid lookup: %s" % lookup_type)
 
 class ImageField(fields.Field):
+    def from_ldap(self, value, connection):
+        if len(value) == 0:
+            return ''
+        else:
+            return value[0]
+
     def get_db_prep_lookup(self, lookup_type, value):
         "Returns field's value prepared for database lookup."
         return [self.get_prep_lookup(lookup_type, value)]
 
+    def get_db_prep_save(self, value, connection):
+        return [value]
+
     def get_prep_lookup(self, lookup_type, value):
         "Perform preliminary non-db specific lookup checks and conversions"
         raise TypeError("ImageField has invalid lookup: %s" % lookup_type)
 
 class IntegerField(fields.IntegerField):
+    def from_ldap(self, value, connection):
+        if len(value) == 0:
+            return 0
+        else:
+            return int(value[0])
+        
     def get_db_prep_lookup(self, lookup_type, value):
         "Returns field's value prepared for database lookup."
         return [self.get_prep_lookup(lookup_type, value)]
 
+    def get_db_prep_save(self, value, connection):
+        return [str(value)]
+
     def get_prep_lookup(self, lookup_type, value):
         "Perform preliminary non-db specific lookup checks and conversions"
         if lookup_type in ('exact', 'gte', 'lte'):
@@ -80,10 +107,16 @@ class IntegerField(fields.IntegerField):
 class ListField(fields.Field):
     __metaclass__ = SubfieldBase
 
+    def from_ldap(self, value, connection):
+        return value
+
     def get_db_prep_lookup(self, lookup_type, value):
         "Returns field's value prepared for database lookup."
         return [self.get_prep_lookup(lookup_type, value)]
 
+    def get_db_prep_save(self, value, connection):
+        return [x.encode(connection.charset) for x in value]
+
     def get_prep_lookup(self, lookup_type, value):
         "Perform preliminary non-db specific lookup checks and conversions"
         if lookup_type == 'contains':