#define r(x)
#define dd(x) if (camel_debug("search")) x
+#define CAMEL_FOLDER_SEARCH_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), CAMEL_TYPE_FOLDER_SEARCH, CamelFolderSearchPrivate))
+
struct _CamelFolderSearchPrivate {
+ GCancellable *cancellable;
GError **error;
CamelFolderThread *threads;
static void
camel_folder_search_init (CamelFolderSearch *search)
{
- search->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- search, CAMEL_TYPE_FOLDER_SEARCH, CamelFolderSearchPrivate);
+ search->priv = CAMEL_FOLDER_SEARCH_GET_PRIVATE (search);
search->sexp = camel_sexp_new ();
}
camel_folder_search_set_folder (CamelFolderSearch *search,
CamelFolder *folder)
{
+ g_return_if_fail (CAMEL_IS_FOLDER_SEARCH (search));
+ g_return_if_fail (CAMEL_IS_FOLDER (folder));
+
search->folder = folder;
}
camel_folder_search_set_summary (CamelFolderSearch *search,
GPtrArray *summary)
{
+ g_return_if_fail (CAMEL_IS_FOLDER_SEARCH (search));
+
search->summary = summary;
}
/**
* camel_folder_search_set_body_index:
* @search:
- * @index:
+ * @body_index:
*
* Set the index representing the contents of all messages
* in this folder. If this is not set, then the folder implementation
**/
void
camel_folder_search_set_body_index (CamelFolderSearch *search,
- CamelIndex *index)
-{
- if (search->body_index)
- g_object_unref (search->body_index);
- search->body_index = index;
- if (index)
- g_object_ref (index);
-}
-
-/**
- * camel_folder_search_execute_expression:
- * @search:
- * @expr:
- * @error: return location for a #GError, or %NULL
- *
- * Execute the search expression @expr, returning an array of
- * all matches as a GPtrArray of uid's of matching messages.
- *
- * Note that any settings such as set_body_index(), set_folder(),
- * and so on are reset to %NULL once the search has completed.
- *
- * TODO: The interface should probably return summary items instead
- * (since they are much more useful to any client).
- *
- * Returns: A GPtrArray of strings of all matching messages.
- * This must only be freed by camel_folder_search_free_result.
- **/
-GPtrArray *
-camel_folder_search_execute_expression (CamelFolderSearch *search,
- const gchar *expr,
- GError **error)
+ CamelIndex *body_index)
{
- CamelSExpResult *r;
- GPtrArray *matches;
- gint i;
- GHashTable *results;
- CamelFolderSearchPrivate *p = search->priv;
-
- p->error = error;
-
- /* only re-parse if the search has changed */
- if (search->last_search == NULL
- || strcmp (search->last_search, expr)) {
- camel_sexp_input_text (search->sexp, expr, strlen (expr));
- if (camel_sexp_parse (search->sexp) == -1) {
- g_set_error (
- error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Cannot parse search expression: %s:\n%s"),
- camel_sexp_error (search->sexp), expr);
- return NULL;
- }
+ g_return_if_fail (CAMEL_IS_FOLDER_SEARCH (search));
- g_free (search->last_search);
- search->last_search = g_strdup (expr);
+ if (body_index != NULL) {
+ g_return_if_fail (CAMEL_IS_INDEX (body_index));
+ g_object_ref (body_index);
}
- r = camel_sexp_eval (search->sexp);
- if (r == NULL) {
- g_set_error (
- error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
- _("Error executing search expression: %s:\n%s"),
- camel_sexp_error (search->sexp), expr);
- return NULL;
- }
-
- matches = g_ptr_array_new ();
- /* now create a folder summary to return?? */
- if (r->type == CAMEL_SEXP_RES_ARRAY_PTR) {
- d(printf("got result ...\n"));
- if (search->summary) {
- /* reorder result in summary order */
- results = g_hash_table_new (g_str_hash, g_str_equal);
- for (i = 0; i < r->value.ptrarray->len; i++) {
- d(printf("adding match: %s\n", (gchar *)g_ptr_array_index(r->value.ptrarray, i)));
- g_hash_table_insert (results, g_ptr_array_index (r->value.ptrarray, i), GINT_TO_POINTER (1));
- }
- for (i = 0; i < search->summary->len; i++) {
- gchar *uid = g_ptr_array_index (search->summary, i);
- if (g_hash_table_lookup (results, uid)) {
- g_ptr_array_add (matches, (gpointer) camel_pstring_strdup (uid));
- }
- }
- g_hash_table_destroy (results);
- } else {
- for (i = 0; i < r->value.ptrarray->len; i++) {
- d(printf("adding match: %s\n", (gchar *)g_ptr_array_index(r->value.ptrarray, i)));
- g_ptr_array_add (matches, (gpointer) camel_pstring_strdup (g_ptr_array_index (r->value.ptrarray, i)));
- }
- }
- } else {
- g_warning("Search returned an invalid result type");
- }
-
- camel_sexp_result_free (search->sexp, r);
-
- if (p->threads)
- camel_folder_thread_messages_unref (p->threads);
- if (p->threads_hash)
- g_hash_table_destroy (p->threads_hash);
-
- p->threads = NULL;
- p->threads_hash = NULL;
- search->folder = NULL;
- search->summary = NULL;
- search->current = NULL;
- search->body_index = NULL;
+ if (search->body_index != NULL)
+ g_object_unref (search->body_index);
- return matches;
+ search->body_index = body_index;
}
/**
* camel_folder_search_count:
* @search:
* @expr:
+ * @cancellable: a #GCancellable
* @error: return location for a #GError, or %NULL
*
* Run a search. Search must have had Folder already set on it, and
guint32
camel_folder_search_count (CamelFolderSearch *search,
const gchar *expr,
+ GCancellable *cancellable,
GError **error)
{
CamelSExpResult *r;
GHashTable *results;
guint32 count = 0;
- CamelFolderSearchPrivate *p = search->priv;
+ CamelFolderSearchPrivate *p;
+
+ g_return_val_if_fail (search != NULL, 0);
+
+ p = search->priv;
g_assert (search->folder);
+ p->cancellable = cancellable;
p->error = error;
/* We route body-contains search and thread based search through memory and not via db. */
if (search->summary)
camel_folder_free_summary (search->folder, search->summary);
+ p->cancellable = NULL;
+ p->error = NULL;
p->threads = NULL;
p->threads_hash = NULL;
search->folder = NULL;
do_search_in_memory (const gchar *expr)
{
/* if the expression contains any of these tokens, then perform a memory search, instead of the SQL one */
- const gchar *in_memory_tokens[] = { "body-contains", "body-regex", "match-threads", "message-location", "header-soundex", "header-regex", "header-full-regex", "header-contains", NULL };
+ const gchar *in_memory_tokens[] = {
+ "body-contains",
+ "body-regex",
+ "match-threads",
+ "message-location",
+ "header-soundex",
+ "header-regex",
+ "header-full-regex",
+ "header-contains",
+ "header-has-words",
+ NULL };
gint i;
if (!expr)
* @search:
* @expr:
* @uids: to search against, NULL for all uid's.
+ * @cancellable: a #GCancellable
* @error: return location for a #GError, or %NULL
*
* Run a search. Search must have had Folder already set on it, and
camel_folder_search_search (CamelFolderSearch *search,
const gchar *expr,
GPtrArray *uids,
+ GCancellable *cancellable,
GError **error)
{
CamelSExpResult *r;
gchar *sql_query, *tmp, *tmp1;
GHashTable *results;
- CamelFolderSearchPrivate *p = search->priv;
+ CamelFolderSearchPrivate *p;
+
+ g_return_val_if_fail (search != NULL, NULL);
+
+ p = search->priv;
g_assert (search->folder);
+ p->cancellable = cancellable;
p->error = error;
/* We route body-contains / thread based search and uid search through memory and not via db. */
if (search->summary)
camel_folder_free_summary (search->folder, search->summary);
+ p->cancellable = NULL;
+ p->error = NULL;
p->threads = NULL;
p->threads_hash = NULL;
search->folder = NULL;
camel_folder_summary_prepare_fetch_all (search->folder->summary, search->priv->error);
}
- for (i = 0; i < v->len; i++) {
+ for (i = 0; i < v->len && !g_cancellable_is_cancelled (search->priv->cancellable); i++) {
const gchar *uid;
search->current = camel_folder_summary_get (search->folder->summary, v->pdata[i]);
if (!search || !search->folder || !search->current)
return NULL;
- /* FIXME Pass a GCancellable */
return camel_folder_get_message_sync (
- search->folder, search->current->uid, NULL, NULL);
+ search->folder, search->current->uid, search->priv->cancellable, NULL);
}
static CamelSExpResult *
static gboolean
match_words_1message (CamelDataWrapper *object,
struct _camel_search_words *words,
- guint32 *mask)
+ guint32 *mask,
+ GCancellable *cancellable)
{
CamelDataWrapper *containee;
gint truth = FALSE;
for (i = 0; i < parts && truth == FALSE; i++) {
CamelDataWrapper *part = (CamelDataWrapper *) camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
if (part)
- truth = match_words_1message (part, words, mask);
+ truth = match_words_1message (part, words, mask, cancellable);
}
} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
/* for messages we only look at its contents */
- truth = match_words_1message ((CamelDataWrapper *) containee, words, mask);
+ truth = match_words_1message ((CamelDataWrapper *) containee, words, mask, cancellable);
} else if (camel_content_type_is(CAMEL_DATA_WRAPPER (containee)->mime_type, "text", "*")) {
/* for all other text parts, we look inside, otherwise we dont care */
CamelStream *stream;
stream = camel_stream_mem_new_with_byte_array (byte_array);
/* FIXME The match should be part of a stream op */
- /* FIXME Pass a GCancellable and GError here. */
camel_data_wrapper_decode_to_stream_sync (
- containee, stream, NULL, NULL);
+ containee, stream, cancellable, NULL);
camel_stream_write (stream, "", 1, NULL, NULL);
for (i = 0; i < words->len; i++) {
/* FIXME: This is horridly slow, and should use a real search algorithm */
msg = camel_folder_get_message_sync (folder, uid, cancellable, error);
if (msg) {
mask = 0;
- truth = match_words_1message ((CamelDataWrapper *) msg, words, &mask);
+ truth = match_words_1message ((CamelDataWrapper *) msg, words, &mask, cancellable);
g_object_unref (msg);
}
truth = match_message_index (search->body_index, camel_message_info_uid (search->current), words->words[j]->word, error);
} else {
/* TODO: cache current message incase of multiple body search terms */
- /* FIXME Pass a GCancellable */
- truth = match_words_message (search->folder, camel_message_info_uid (search->current), words, NULL, error);
+ truth = match_words_message (search->folder, camel_message_info_uid (search->current), words, search->priv->cancellable, error);
}
camel_search_words_free (words);
}
if ((words->type & CAMEL_SEARCH_WORD_COMPLEX) == 0 && search->body_index) {
matches = match_words_index (search, words, error);
} else {
- /* FIXME Pass a GCancellable */
- matches = match_words_messages (search, words, NULL, error);
+ matches = match_words_messages (search, words, search->priv->cancellable, error);
}
for (j = 0; j < matches->len; j++) {
g_hash_table_insert (ht, matches->pdata[j], matches->pdata[j]);
GPtrArray *v = search->summary_set ? search->summary_set : search->summary;
CamelMimeMessage *message;
- for (i = 0; i < v->len; i++) {
+ for (i = 0; i < v->len && !g_cancellable_is_cancelled (search->priv->cancellable); i++) {
gchar *uid = g_ptr_array_index (v, i);
- /* FIXME Pass a GCancellable */
message = camel_folder_get_message_sync (
- search->folder, uid, NULL, NULL);
+ search->folder, uid, search->priv->cancellable, NULL);
if (message) {
if (camel_search_message_body_contains ((CamelDataWrapper *) message, &pattern)) {
g_ptr_array_add (r->value.ptrarray, uid);
projects / platform / upstream / evolution-data-server.git / blobdiff