diff src/lib-storage/index/index-search.c @ 716:dd574ac271c1 HEAD

Body searching wasn't working with unknown charsets, and SEARCH BODY searched also headers.
author Timo Sirainen <tss@iki.fi>
date Sat, 30 Nov 2002 16:58:23 +0200
parents 3e952f64b2ec
children d3bd41a56309
line wrap: on
line diff
--- a/src/lib-storage/index/index-search.c	Sat Nov 30 16:36:20 2002 +0200
+++ b/src/lib-storage/index/index-search.c	Sat Nov 30 16:58:23 2002 +0200
@@ -534,7 +534,7 @@
 		ret = message_body_search(arg->value.str,
 					  ctx->index_ctx->charset,
 					  &unknown_charset, ctx->inbuf,
-					  ctx->part);
+					  ctx->part, arg->type == SEARCH_TEXT);
 
 		if (ret < 0) {
 			ctx->index_ctx->error = unknown_charset ?
@@ -548,7 +548,6 @@
 static int search_arg_match_text(MailSearchArg *args, SearchIndexContext *ctx)
 {
 	IBuffer *inbuf;
-	MessageSize hdr_size;
 	int have_headers, have_body, have_text;
 
 	/* first check what we need to use */
@@ -567,11 +566,11 @@
 		hdr_ctx.custom_header = TRUE;
 		hdr_ctx.args = args;
 
-		message_parse_header(NULL, inbuf, &hdr_size,
+		message_parse_header(NULL, inbuf, NULL,
 				     search_header, &hdr_ctx);
 	} else {
 		if (!imap_msgcache_get_rfc822(search_open_cache(ctx), &inbuf,
-					      &hdr_size, NULL))
+					      NULL, NULL))
 			return FALSE;
 	}