evolution-data-server r9326 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Tue Aug 12 08:39:13 2008
New Revision: 9326
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9326&view=rev

Log:
2008-08-12  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-search-sql.c: Fix another search issue.


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

Modified: trunk/camel/camel-search-sql.c
==============================================================================
--- trunk/camel/camel-search-sql.c	(original)
+++ trunk/camel/camel-search-sql.c	Tue Aug 12 08:39:13 2008
@@ -574,6 +574,7 @@
 							n3->exact_token = g_strdup("");
 							temp_op = "LIKE";
 							n3->ignore_lhs = 0;
+							dyn_lvl = opnode->level;
 						}
 						
 							
@@ -716,7 +717,6 @@
 
 	}
 	
-
 	tmp = operands;
 	d(g_node_dump (operands));
 	while (tmp) {
@@ -955,8 +955,11 @@
 	
 	"(and ( (or (match-all (header-contains \"Subject\"  \"lin\")) )) ((and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (and   (or (match-all (header-contains \"Subject\"  \"case\")) (match-all (header-contains \"From\"  \"case\")))))))", 
 	"(and ( match-all(or (match-all (header-contains \"Subject\"  \"lin\")) (match-all (header-contains \"From\"  \"in\")))) ((and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (and   (or (match-all (header-contains \"Subject\"  \"proc\")) (match-all (header-contains \"From\"  \"proc\")))))))", 
-	"(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (and   (and (match-all (header-contains \"Subject\"  \"mysubject\")) (match-all (not (header-matches \"From\"  \"mysender\"))) (match-all (= (get-sent-date) (+ (get-current-date) 1))) (match-all (= (get-received-date) (- (get-current-date) 604800))) (match-all (or (= (user-tag \"label\")  \"important\") (user-flag (+ \"$Label\"  \"important\")) (match-all (< (get-size) 7000)) (match-all (not (= (get-sent-date) 1216146600)))  (match-all (> (cast-int (user-tag \"score\")) 3))  (user-flag  \"important\"))) (match-all (system-flag  \"Deleted\")) (match-all (not (= (user-tag \"follow-up\") \"\"))) (match-all (= (user-tag \"completed-on\") \"\")) (match-all (system-flag \"Attachments\")) (match-all (header-contains \"x-camel-mlist\"  \"evo-hackers\")) )))"
+	"(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (and   (and (match-all (header-contains \"Subject\"  \"mysubject\")) (match-all (not (header-matches \"From\"  \"mysender\"))) (match-all (= (get-sent-date) (+ (get-current-date) 1))) (match-all (= (get-received-date) (- (get-current-date) 604800))) (match-all (or (= (user-tag \"label\")  \"important\") (user-flag (+ \"$Label\"  \"important\")) (match-all (< (get-size) 7000)) (match-all (not (= (get-sent-date) 1216146600)))  (match-all (> (cast-int (user-tag \"score\")) 3))  (user-flag  \"important\"))) (match-all (system-flag  \"Deleted\")) (match-all (not (= (user-tag \"follow-up\") \"\"))) (match-all (= (user-tag \"completed-on\") \"\")) (match-all (system-flag \"Attachments\")) (match-all (header-contains \"x-camel-mlist\"  \"evo-hackers\")) )))",
+	"(and  (or (match-all (header-contains \"Subject\"  \"[LDTP-NOSIP]\")) ) (and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (and   (or (match-all (header-contains \"Subject\"  \"vamsi\")) (match-all (header-contains \"From\"  \"vamsi\"))))))",
 	/* Last one doesn't work so well and fails on one case. But I doubt, you can create a query like that in Evo. */
+	"(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\")))) (match-all (or (= (user-tag \"label\") \"_office\") (user-flag \"$Label_office\") (user-flag \"_office\"))))"
+
 	};
 
 	for (i=0; i < G_N_ELEMENTS(txt); i++) {

Modified: trunk/camel/camel-vtrash-folder.c
==============================================================================
--- trunk/camel/camel-vtrash-folder.c	(original)
+++ trunk/camel/camel-vtrash-folder.c	Tue Aug 12 08:39:13 2008
@@ -636,8 +636,9 @@
 	
 	folder_class->append_message = vtrash_append_message;
 	folder_class->transfer_messages_to = vtrash_transfer_messages_to;
-	folder_class->search_by_expression = vtrash_search_by_expression;
-	folder_class->search_by_uids = vtrash_search_by_uids;
+	/* Not required, lets use the base class search function */
+	/* folder_class->search_by_expression = vtrash_search_by_expression; */
+	/* folder_class->search_by_uids = vtrash_search_by_uids; */
 
 	((CamelVeeFolderClass *)klass)->add_folder = vtrash_add_folder;
 	((CamelVeeFolderClass *)klass)->remove_folder = vtrash_remove_folder;