From 6ccd0e6f59bec5f1900c49cd1868fca998570fc7 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 18 Apr 2002 02:18:55 +0000 Subject: When doing a contains match, split the words and perform an and on it. 2002-04-18 Not Zed * camel-folder-search.c (check_header): When doing a contains match, split the words and perform an and on it. (match_words_messages): If we have an index, but were forced to do a full search, first lookup a subset of messages using the index and a simplified word set. Only do a manual search of this subset. 2002-04-17 Not Zed * camel-folder-search.c (match_message_index): Changed to take a utf8 string not a regex pattern. (match_words_index): Matches against a camel_search_words list. (match_words_1message): Matches a single message against a camel_search_words list. (match_words_message): Same, but gets the message from the folder for you. (match_words_messages): Matches a list of messages against a words list. (search_body_contains): Rewritten to handle multiple word searches. For #23371. * providers/imap/camel-imap-search.c (sync_match): Split words when searching, to support multiple search words. Also, try searching specifying charset of utf8 if we can, if that fails, fall back to not specifying charset. TODO: It should translate the strings into the locale default charset? * providers/imap/camel-imap-store.c (connect_to_server): Added new cap - utf8_search, if set, we tell the server we're searching using utf8, otherwise we dont (incorrectly, since we always use utf8 to search). * camel-search-private.c (camel_ustrstrcase): Make this class public. (camel_search_words_split): Split a word into multiple words based on whitespace, and keep track of whether the word is simple (indexable directly), or not. (camel_search_words_free): Free 'em. svn path=/trunk/; revision=16501 --- camel/providers/imap/camel-imap-search.c | 39 ++++++++++++++++++++++++++++---- camel/providers/imap/camel-imap-store.c | 3 ++- camel/providers/imap/camel-imap-store.h | 1 + 3 files changed, 38 insertions(+), 5 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c index 8463eb202b..c30fa5611e 100644 --- a/camel/providers/imap/camel-imap-search.c +++ b/camel/providers/imap/camel-imap-search.c @@ -42,6 +42,7 @@ #include "camel-mime-utils.h" /* base64 encoding */ #include "camel-seekable-stream.h" +#include "camel-search-private.h" #define d(x) x @@ -304,10 +305,13 @@ static int sync_match(CamelImapSearch *is, struct _match_record *mr) { char *p, *result, *lasts = NULL; - CamelImapResponse *response; + CamelImapResponse *response = NULL; guint32 uid; CamelFolder *folder = ((CamelFolderSearch *)is)->folder; CamelImapStore *store = (CamelImapStore *)folder->parent_store; + struct _camel_search_words *words; + GString *search; + int i; if (mr->lastuid >= is->lastuid && mr->validity == is->validity) return 0; @@ -316,9 +320,36 @@ sync_match(CamelImapSearch *is, struct _match_record *mr) /* TODO: Handle multiple search terms */ - response = camel_imap_command (store, folder, NULL, - "UID SEARCH UID %d:%d BODY \"%s\"", - mr->lastuid+1, is->lastuid, mr->terms[0]); + /* This handles multiple search words within a single term */ + words = camel_search_words_split(mr->terms[0]); + search = g_string_new(""); + g_string_sprintfa(search, "UID %d:%d", mr->lastuid+1, is->lastuid); + for (i=0;ilen;i++) { + char *w = words->words[i]->word, c; + + g_string_sprintfa(search, " BODY \""); + while ((c = *w++)) { + if (c == '\\' || c == '"') + g_string_append_c(search, '\\'); + g_string_append_c(search, c); + } + g_string_append_c(search, '"'); + } + camel_search_words_free(words); + + /* We only try search using utf8 if its non us-ascii text? */ + if ((words->type & CAMEL_SEARCH_WORD_8BIT) && (store->capabilities & IMAP_CAPABILITY_utf8_search)) { + response = camel_imap_command(store, folder, NULL, + "UID SEARCH CHARSET UTF-8 %s", search->str); + /* We can't actually tell if we got a NO response, so assume always */ + if (response == NULL) + store->capabilities &= ~IMAP_CAPABILITY_utf8_search; + } + if (response == NULL) + response = camel_imap_command (store, folder, NULL, + "UID SEARCH %s", search->str); + g_string_free(search, TRUE); + if (!response) return -1; result = camel_imap_response_extract (store, response, "SEARCH", NULL); diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index b3d98db759..ce87174486 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -342,7 +342,8 @@ connect_to_server (CamelService *service, CamelException *ex) store->connected = TRUE; /* Find out the IMAP capabilities */ - store->capabilities = 0; + /* We assume we have utf8 capable search until a failed search tells us otherwise */ + store->capabilities = IMAP_CAPABILITY_utf8_search; store->authtypes = g_hash_table_new (g_str_hash, g_str_equal); response = camel_imap_command (store, NULL, ex, "CAPABILITY"); if (!response) diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h index 43c9b8e1f0..9a6c6655ad 100644 --- a/camel/providers/imap/camel-imap-store.h +++ b/camel/providers/imap/camel-imap-store.h @@ -71,6 +71,7 @@ typedef enum { #define IMAP_CAPABILITY_UIDPLUS (1 << 4) #define IMAP_CAPABILITY_LITERALPLUS (1 << 5) #define IMAP_CAPABILITY_useful_lsub (1 << 6) +#define IMAP_CAPABILITY_utf8_search (1 << 7) #define IMAP_PARAM_OVERRIDE_NAMESPACE (1 << 0) #define IMAP_PARAM_CHECK_ALL (1 << 1) -- cgit