r5520 - trunk/cumin/python/cumin

Author: croberts
Date: 2012-10-23 19:50:40 +0000 (Tue, 23 Oct 2012)
New Revision: 5520

Modified:
   trunk/cumin/python/cumin/objectselector.py
Log:
The selectable field searching will now use case insensitive searching for all text fields.

Modified: trunk/cumin/python/cumin/objectselector.py
===================================================================
--- trunk/cumin/python/cumin/objectselector.py	2012-10-23 19:49:54 UTC (rev 5519)
+++ trunk/cumin/python/cumin/objectselector.py	2012-10-23 19:50:40 UTC (rev 5520)
@@ -4,7 +4,7 @@
 from cumin.util import Identifiable, xml_escape, fmt_ddhhmm_timestamp

from rosemary.model import RosemaryClass, RosemaryAttribute, RosemaryReference
-from rosemary.sqlfilter import SqlFilter, SqlLikeFilter, SqlValueFilter, SqlDateValueFilter
+from rosemary.sqlfilter import SqlFilter, SqlLikeFilter, SqlILikeFilter, SqlValueFilter, SqlDateValueFilter

from wooly.util import StringCatalog, Writer, escape_entity, parse_date_from_string
 from wooly.datatable import DataTable, DataTableColumn
@@ -458,7 +458,7 @@
                 pre = "%%"
             else:
                 post = ""
-            self.adapter.query.add_filter(self.SelectableFieldLikeFilter(sql_column))                    
+            self.adapter.query.add_filter(self.SelectableFieldILikeFilter(sql_column))

values[customfield] = "%s%s%s" % (pre, customvalue, post)

@@ -523,6 +523,9 @@
     class SelectableFieldLikeFilter(SqlLikeFilter, SelectableFieldFilter):
         pass

+    class SelectableFieldILikeFilter(SqlILikeFilter, SelectableFieldFilter):
+        pass
+    
     class SelectableFieldValueFilter(SqlValueFilter, SelectableFieldFilter):
         pass