** Fix for BNC bug #418080

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

	** Fix for BNC bug #418080

	* camel/camel-folder-search.c: Make thing better, with new sexp/sql
	parser.

svn path=/trunk/; revision=9471

diff --git a/camel/ChangeLog b/camel/ChangeLog
index bfdd2b3..db4f962 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,12 @@
 2008-09-03  Srinivasa Ragavan  <sragavan@novell.com>
 
+       ** Fix for BNC bug #418080
+
+       * camel/camel-folder-search.c: Make thing better, with new sexp/sql
+       parser.
+
+2008-09-03  Srinivasa Ragavan  <sragavan@novell.com>
+
        * camel/Makefile.am: 
        * camel/camel-search-sql-sexp.c: New Sexp based sexp to sql parser.
        * camel/camel-search-sql-sexp.h:

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 24c7e2b..d511b37 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -51,6 +51,7 @@
 #include "camel-vee-folder.h"
 #include "camel-string-utils.h"
 #include "camel-search-sql.h"
+#include "camel-search-sql-sexp.h"
 
 #define d(x) 
 #define r(x) 
@@ -483,7 +484,10 @@ camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArra
                camel_folder_summary_save_to_db (search->folder->summary, ex);
        
                d(printf ("sexp is : [%s]\n", expr));
-               sql_query = camel_sexp_to_sql (expr);
+               if (g_getenv("SQL_SEARCH_OLD"))
+                       sql_query = camel_sexp_to_sql (expr);
+               else
+                       sql_query = camel_sexp_to_sql_sexp (expr);
                tmp1 = camel_db_sqlize_string(search->folder->full_name);
                tmp = g_strdup_printf ("SELECT uid FROM %s %s %s", tmp1, sql_query ? "WHERE":"", sql_query?sql_query:"");
                camel_db_free_sqlized_string (tmp1);