** Fix for BNC bug #418080

2008-09-10  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for BNC bug #418080

	* camel/camel-search-sql-sexp.c: Match contains using %like%.

svn path=/trunk/; revision=9510

diff --git a/camel/ChangeLog b/camel/ChangeLog
index ef9341b..593799b 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-10  Srinivasa Ragavan  <sragavan@novell.com>
 
+       ** Fix for BNC bug #418080
+
+       * camel/camel-search-sql-sexp.c: Match contains using %like%.
+
+2008-09-10  Srinivasa Ragavan  <sragavan@novell.com>
+
        * camel/camel-folder-search.c: Fix a bug when sexp is executed
        unnecessarily.
 

diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index b1f2c27..7dcff52 100644 (file)
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -363,7 +363,9 @@ check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data
                                        value = get_db_safe_string (tstr);
                                        g_free (tstr);
                                } else if (how == CAMEL_SEARCH_MATCH_EXACT) {
-                                       value = get_db_safe_string(argv[i]->value.string);
+                                       tstr = g_strdup_printf ("%c%s%c", '%', argv[i]->value.string, '%');
+                                       value = get_db_safe_string (tstr);
+                                       g_free (tstr);
                                }
                                str = g_strdup_printf("(%s LIKE %s)", headername, value);
                                g_free(value);
@@ -708,7 +710,7 @@ int main ()
        for (i=0; i < G_N_ELEMENTS(txt); i++) {
                char *sql = NULL;
                printf("Q: %s\n\"%c\"\n", txt[i], 40);          
-               sql = camel_e_sexp_to_sql (txt[i]);
+               sql = camel_sexp_to_sql_sexp (txt[i]);
                printf("A: %s\n\n\n", sql);
                g_free (sql);
        }