evolution-data-server r9180 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Thu Jul 24 19:56:33 2008
New Revision: 9180
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9180&view=rev

Log:
2008-07-25  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-search-sql.c: Further improve search.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-search-sql.c

Modified: trunk/camel/camel-search-sql.c
==============================================================================
--- trunk/camel/camel-search-sql.c	(original)
+++ trunk/camel/camel-search-sql.c	Thu Jul 24 19:56:33 2008
@@ -71,7 +71,7 @@
                         "_-0123456789"
                         G_CSET_A_2_Z
                         )                       /* cset_identifier_nth */,
-                ( "\n" )               /* cpair_comment_single */,
+                ( "" )               /* cpair_comment_single */,
                 FALSE                    /* case_sensitive */,
                 TRUE                    /* skip_comment_multi */,
                 TRUE                    /* skip_comment_single */,
@@ -752,17 +752,17 @@
 		return sql;
 	}
 		
-	while (all->next) {
+	while (all) {
 		 n1 = tmp->data;
 		 all = g_list_delete_link (all, all);
 		 tmp = all;
-
+		 d(printf("coming %s\n", n1->exact_token));
 		 if (n1->operator) {
 			  if (res->next) {
 				   GList *ts=res;
 				   Node *n = ts->data;
 				   GString *s = g_string_new (NULL);
-					
+
 				   g_string_append_printf (s, "(%s", n->exact_token);
 				   ts = ts->next;
 				   while (ts) { /* should have atleast 2 nodes */
@@ -786,6 +786,7 @@
 			  tmp = all;
 		 } else {
 			  res = g_list_prepend (res, n1);
+			  d(printf("app %s\n", n1->exact_token));
 		 }
 	}
 		
@@ -899,6 +900,7 @@
 	"(match-all (not (system-flag \"deleted\")))",
 	"(match-all (system-flag \"seen\"))",
 	"(match-all (and  (match-all #t) (system-flag \"deleted\")))",
+	"(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))"
 
 	};