New CamelFolderSearch subclass that just reimplements body_contains (using

	* providers/imap/camel-imap-search.c: New CamelFolderSearch
	subclass that just reimplements body_contains (using the IMAP
	SEARCH command). All other kinds of searching are done against the
	local summary.

	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
	Use a CamelImapSearch to do searching.

	* providers/imap/camel-imap-utils.c (imap_translate_sexp, etc): No
	longer needed.

	* camel-folder-search.h: Add missing CAMEL_FOLDER_SEARCH_TYPE
	#define

svn path=/trunk/; revision=7119

1 files changed, 0 insertions, 393 deletions

diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 05c9d01d5e..3e3f4af031 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -125,399 +125,6 @@ imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder)
 	return TRUE;
 }
 
-static ESExpResult *
-func_and (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in AND func (argc = %d)\n", argc));
-	if (argc > 0) {
-		char **strings;
-		int i;
-		
-		strings = g_new (char*, argc+1);
-		strings[argc] = NULL;
-		
-		for (i = 0; i < argc; i++) {
-			GList *list_head = *list;
-			
-			d(fprintf (stderr, "\tAND func: %s\n", (*list) ? (char *) (*list)->data : "(null)"));
-			strings[argc - (i+1)] = (*list) ? (*list)->data : g_strdup ("");
-			*list = g_list_remove_link (*list, *list);
-			g_list_free_1 (list_head);
-		}
-		
-		*list = g_list_prepend (*list, g_strjoinv (" ", strings));
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		
-		for (i = 0 ; i < argc; i ++)
-			g_free (strings[i]);
-		
-		g_free (strings);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_or (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in OR func (argc = %d)\n", argc));
-	if (argc == 2 && (*list)->data && (*list)->next && (*list)->next->data) {
-		char **strings;
-		int i;
-		
-		strings = g_new (char*, argc+2);
-		strings[0] = g_strdup ("OR");
-		strings[argc+2 - 1] = NULL;
-		
-		for (i = 0; i < 2; i++) {
-			GList *list_head = *list;
-			
-			d(fprintf (stderr, "\tOR func: %s\n", (*list) ? (char *) (*list)->data : "(null)"));
-			strings[argc - i] = (*list) ? (*list)->data : g_strdup ("");
-			*list = g_list_remove_link (*list, *list);
-			g_list_free_1 (list_head);
-		}
-		
-		*list = g_list_prepend (*list, g_strjoinv (" ", strings));
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-		
-		g_free (strings);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_not (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in NOT func\n"));
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		
-		(*list)->data = g_strdup_printf ("NOT %s", term);
-		d(fprintf (stderr, "%s\n", (char *) (*list)->data));
-		g_free (term);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *
-format_date (time_t time, int offset)
-{
-	struct tm tm;
-	
-	time += ((offset / 100) * (60*60)) + (offset % 100)*60;
-	
-	d(printf("converting date %s", ctime (&time)));
-	
-	memcpy (&tm, gmtime (&time), sizeof (tm));
-
-	return g_strdup_printf ("%d-%s-%04d",
-				tm.tm_mday, tz_months[tm.tm_mon],
-				tm.tm_year + 1900);
-}
-
-static ESExpResult *
-func_lt (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in less-than func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTBEFORE \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("BEFORE \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_gt (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in greater-than func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTSINCE \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("SINCE \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_eq (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *type = (*list)->data;
-	time_t date = (time_t) (argv[1])->value.number;
-	ESExpResult *r;
-	
-	d(fprintf (stderr, "in equal-to func: (%d) (%s) (%d)\n", argc, type, (int) date));
-	if (argc > 0) {
-		char *string, *date_str;
-		
-		date_str = format_date (date, 0);
-		
-		if (!strcmp ("SENT", type)) {
-			string = g_strdup_printf ("SENTON \"%s\"", date_str);
-		} else {
-			string = g_strdup_printf ("ON \"%s\"", date_str);
-		}
-		
-		(*list)->data = string;
-		g_free (type);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_match_all (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* match-all doesn't have a IMAP equiv */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *value = (*argv)->value.string;
-	ESExpResult *r;
-	
-	if (argc > 0) {
-		char *string;
-		
-		string = g_strdup_printf ("BODY \"%s\"", value);
-		
-		*list = g_list_prepend (*list, string);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	char *header = (argv[0])->value.string;
-	char *match = (argv[1])->value.string;
-	ESExpResult *r;
-	
-	if (argc == 2) {
-		char *string;
-		string = g_strdup_printf ("HEADER %s \"%s\"", header, match);
-		
-		*list = g_list_prepend (*list, string);
-	}
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* FIXME: what do I do here? */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	/* FIXME: what do I do here? */
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	*list = g_list_prepend (*list, g_strdup ("SENT"));
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	
-	*list = g_list_prepend (*list, g_strdup ("RECEIVED"));
-	
-	r = e_sexp_result_new (ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-	
-	return r;
-}
-
-static ESExpResult *
-func_get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	ESExpResult *r;
-	
-	r = e_sexp_result_new (ESEXP_RES_INT);
-	r->value.number = time (NULL);
-	
-	return r;
-}
-
-/* builtin functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and",               (ESExpFunc *) func_and,               0 },
-	{ "or",                (ESExpFunc *) func_or,                0 },
-	{ "not",               (ESExpFunc *) func_not,               0 },
-	{ "<",                 (ESExpFunc *) func_lt,                0 },
-	{ ">",                 (ESExpFunc *) func_gt,                0 },
-	{ "=",                 (ESExpFunc *) func_eq,                0 },
-	{ "match-all",         (ESExpFunc *) func_match_all,         0 },
-	{ "body-contains",     (ESExpFunc *) func_body_contains,     0 },
-	{ "header-contains",   (ESExpFunc *) func_header_contains,   0 },
-	{ "user-tag",          (ESExpFunc *) func_user_tag,          1 },
-	{ "user-flag",         (ESExpFunc *) func_user_flag,         1 },
-	{ "get-sent-date",     (ESExpFunc *) func_get_sent_date,     1 },
-	{ "get-received-date", (ESExpFunc *) func_get_received_date, 1 },
-	{ "get-current-date",  (ESExpFunc *) func_get_current_date,  1 }
-};
-
-char *
-imap_translate_sexp (const char *expression)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-	
-	sexp = e_sexp_new ();
-	
-	for (i = 0; i < sizeof (symbols) / sizeof (symbols[0]); i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction (sexp, 0, symbols[i].name,
-					      (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function (sexp, 0, symbols[i].name,
-					     symbols[i].func, &list);
-		}
-	}
-	
-	e_sexp_input_text (sexp, expression, strlen (expression));
-	
-	e_sexp_parse (sexp);
-	
-	r = e_sexp_eval (sexp);
-	
-	gtk_object_unref (GTK_OBJECT (sexp));
-	e_sexp_result_free (r);
-	
-	if (list->next) {
-		g_warning ("conversion to IMAP SEARCH string failed");
-		retval = NULL;
-		g_list_foreach (list, (GFunc)g_free, NULL);
-	} else {
-		retval = list->data;
-	}
-	
-	g_list_free (list);
-	
-	return retval;
-}
-
 char *
 imap_create_flag_list (guint32 flags)
 {