X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-search.c;h=31aa485022a2e13568207f280237f7131af2d977;hb=65682ca70e6d3983f705ec94d7acc87418806f0c;hp=10dd422f56ce73846ca1bfd435de07b743e39aa4;hpb=5cde51239f3a9c674558d35d6c7e4157e1d70591;p=modest diff --git a/src/modest-search.c b/src/modest-search.c index 10dd422..31aa485 100644 --- a/src/modest-search.c +++ b/src/modest-search.c @@ -65,6 +65,7 @@ g_strdup_or_null (const gchar *str) return string; } + static GList* add_hit (GList *list, TnyHeader *header, TnyFolder *folder) { @@ -79,6 +80,7 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder) hit = g_slice_new0 (ModestSearchHit); furl = tny_folder_get_url_string (folder); + printf ("DEBUG: %s: folder URL=%s\n", __FUNCTION__, furl); if (!furl) { g_warning ("%s: tny_folder_get_url_string(): returned NULL for folder. Folder name=%s\n", __FUNCTION__, tny_folder_get_name (folder)); } @@ -93,16 +95,17 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder) } msg_url = g_strdup_printf ("%s/%s", furl, uid); + g_free (furl); subject = tny_header_get_subject (header); sender = tny_header_get_from (header); - + flags = tny_header_get_flags (header); hit->msgid = msg_url; hit->subject = g_strdup_or_null (subject); hit->sender = g_strdup_or_null (sender); - hit->folder = furl; /* We just provide our new instance instead of copying it and freeing it. */ + hit->folder = g_strdup_or_null (tny_folder_get_name (folder)); hit->msize = tny_header_get_message_size (header); hit->has_attachment = flags & TNY_HEADER_FLAG_ATTACHMENTS; hit->is_unread = ! (flags & TNY_HEADER_FLAG_SEEN); @@ -135,8 +138,6 @@ read_chunk (TnyStream *stream, char *buffer, gsize count, gsize *nread) *nread = _nread; return TRUE; - - } #ifdef MODEST_HAVE_OGS @@ -152,8 +153,9 @@ search_mime_part_ogs (TnyMimePart *part, ModestSearch *search) gboolean res; - if (! tny_mime_part_content_type_is (part, "text/ *") || + if (! tny_mime_part_content_type_is (part, "text/*") || ! (is_html = tny_mime_part_content_type_is (part, "text/html"))) { + g_debug ("%s: No text or html MIME part found.\n", __FUNCTION__); return FALSE; } @@ -163,6 +165,8 @@ search_mime_part_ogs (TnyMimePart *part, ModestSearch *search) while ((res = read_chunk (stream, buffer, len, &nread))) { + /* search->text_searcher was instantiated in modest_search_folder(). */ + if (is_html) { found = ogs_text_searcher_search_html (search->text_searcher, @@ -186,10 +190,22 @@ search_mime_part_ogs (TnyMimePart *part, ModestSearch *search) } ogs_text_searcher_reset (search->text_searcher); + + /* debug stuff: + if (!found) { + buffer[len -1] = 0; + printf ("DEBUG: %s: query %s was not found in message text: %s\n", + __FUNCTION__, search->query, buffer); + + } else { + printf ("DEBUG: %s: found.\n", __FUNCTION__); + } + */ return found; } -#endif /*MODEST_HAVE_OGS*/ + +#else static gboolean search_mime_part_strcmp (TnyMimePart *part, ModestSearch *search) @@ -197,12 +213,13 @@ search_mime_part_strcmp (TnyMimePart *part, ModestSearch *search) TnyStream *stream; char buffer[8193]; char *chunk[2]; - gsize len; - gssize nread; + gssize len; + gsize nread; gboolean found; gboolean res; - if (! tny_mime_part_content_type_is (part, "text/ *")) { + if (! tny_mime_part_content_type_is (part, "text/*")) { + g_debug ("%s: No text MIME part found.\n", __FUNCTION__); return FALSE; } @@ -267,6 +284,7 @@ done: g_object_unref (stream); return found; } +#endif /*MODEST_HAVE_OGS*/ static gboolean search_string (const char *what, @@ -308,12 +326,9 @@ GList * modest_search_folder (TnyFolder *folder, ModestSearch *search) { GList *retval = NULL; - TnyIterator *iter; - TnyList *list; - gboolean (*part_search_func) (TnyMimePart *part, ModestSearch *search); - - part_search_func = search_mime_part_strcmp; - + TnyIterator *iter = NULL; + TnyList *list = NULL; + #ifdef MODEST_HAVE_OGS if (search->flags & MODEST_SEARCH_USE_OGS) { @@ -324,13 +339,18 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search) ogs_text_searcher_parse_query (text_searcher, search->query); search->text_searcher = text_searcher; } - - part_search_func = search_mime_part_ogs; } #endif list = tny_simple_list_new (); - tny_folder_get_headers (folder, list, FALSE, NULL); + GError *error = NULL; + tny_folder_get_headers (folder, list, FALSE /* don't refresh */, &error); + if (error) { + g_warning ("%s: tny_folder_get_headers() failed with error=%s.\n", + __FUNCTION__, error->message); + g_error_free (error); + error = NULL; + } iter = tny_list_create_iterator (list); @@ -402,12 +422,25 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search) parts = tny_simple_list_new (); tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + + if (tny_list_get_length(parts) == 0) { + gchar *url_string = tny_msg_get_url_string (msg); + g_debug ("DEBUG: %s: tny_mime_part_get_parts(msg) returned an empty list for message url=%s", + __FUNCTION__, url_string); + g_free (url_string); + } piter = tny_list_create_iterator (parts); while (!found && !tny_iterator_is_done (piter)) { TnyMimePart *pcur = (TnyMimePart *) tny_iterator_get_current (piter); - if ((found = part_search_func (pcur, search))) { + #ifdef MODEST_HAVE_OGS + found = search_mime_part_ogs (pcur, search); + #else + found = search_mime_part_strcmp (pcur, search); + #endif + + if (found) { retval = add_hit (retval, cur, folder); } @@ -459,6 +492,8 @@ modest_search_account (TnyAccount *account, ModestSearch *search) GList *res; folder = TNY_FOLDER (tny_iterator_get_current (iter)); + /* g_debug ("DEBUG: %s: searching folder %s.", + __FUNCTION__, tny_folder_get_name (folder)); */ res = modest_search_folder (folder, search); @@ -503,8 +538,8 @@ modest_search_all_accounts (ModestSearch *search) account = TNY_ACCOUNT (tny_iterator_get_current (iter)); - g_debug ("DEBUG: %s: Searching account %s", - __FUNCTION__, tny_account_get_name (account)); + /* g_debug ("DEBUG: %s: Searching account %s", + __FUNCTION__, tny_account_get_name (account)); */ res = modest_search_account (account, search); if (res != NULL) {