2007-05-30 Christian Kellner <ckellner@openismus.com>

* configure.ac:
	Search and check for libogs.

	* src/Makefile.am:
	Incooparte the ogs build env.

	* src/modest-mime-part-search-stream.c:
	* src/modest-mime-part-search-stream.h:
	Removed since we do the real searching now in modest-search.c.

	* src/modest-search.c:
	* src/modest-search.h:
	Implement support for ogs. We use that if available and requested
	and fall back to modest_text_utils_utf8_strcmp (). The search logic
	should now handle the corner case when the search term is spread
	across multiple reads.
	Also the logic in modest_search () was corrected to search all
	requested fields until one is found.

pmo-trunk-r1998

diff --git a/ChangeLog2 b/ChangeLog2
index 0aceec2..a843da3 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,24 @@
+2007-05-30  Christian Kellner  <ckellner@openismus.com>
+
+       * configure.ac:
+       Search and check for libogs.
+
+       * src/Makefile.am:
+       Incooparte the ogs build env.
+
+       * src/modest-mime-part-search-stream.c:
+       * src/modest-mime-part-search-stream.h:
+       Removed since we do the real searching now in modest-search.c.
+
+       * src/modest-search.c:
+       * src/modest-search.h:
+       Implement support for ogs. We use that if available and requested
+       and fall back to modest_text_utils_utf8_strcmp (). The search logic
+       should now handle the corner case when the search term is spread
+       across multiple reads.
+       Also the logic in modest_search () was corrected to search all
+       requested fields until one is found.
+

 2007-05-30  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-defs.h: Define MODEST_MCC1_VOLUMEPATH and MODEST_MCC1_VOLUMEPATH_URI.
 2007-05-30  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-defs.h: Define MODEST_MCC1_VOLUMEPATH and MODEST_MCC1_VOLUMEPATH_URI.

diff --git a/configure.ac b/configure.ac
index a55efb9..292d7b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,28 @@ GTK_DOC_CHECK([1.0])
 dnl Intltool utility programs
 #AC_PROG_INTLTOOL([0.33.0],[no-xml])
 
 dnl Intltool utility programs
 #AC_PROG_INTLTOOL([0.33.0],[no-xml])
 

+#dnl wether we can and should build the 
+#dnl search plugin
+PKG_CHECK_MODULES(OGS, libosso >= 0.8.5 libogs-1.2, have_ogs=true, have_ogs=false)
+
+have_ogs_support=false
+AC_ARG_ENABLE(ogs_support,
+AC_HELP_STRING([--enable-ogs-support],
+       [Build with osso global search support (yes, no)]),
+[case "${enableval}" in
+      yes)
+       if test x$have_ogs = xfalse; then
+               AC_MSG_ERROR([building of ogs support requested and libogs-1.2 not found])
+       fi
+       ;;
+      *) 
+       have_ogs_support=false
+       ;;
+esac],[have_ogs_support=$have_ogs])
+
+if test x$have_ogs_support = xtrue; then
+       AC_DEFINE_UNQUOTED(MODEST_HAVE_OGS, 1, ["Whether ogs is available."])
+fi

 
 AC_OUTPUT([
 po/Makefile.in
 
 AC_OUTPUT([
 po/Makefile.in

@@ -238,6 +260,7 @@ echo "Platform         : $with_platform"
 echo "Build easy setup : $have_easysetup"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"
 echo "Build easy setup : $have_easysetup"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"

+echo "libogs support   : $have_ogs_support"

 echo "Debug version    : $with_debug"
 echo ""
 echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"
 echo "Debug version    : $with_debug"
 echo ""
 echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"

diff --git a/src/Makefile.am b/src/Makefile.am
index ce14819..1b0c3ff 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \

+       $(OGS_CFLAGS) \

        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
        -DMAEMO_CHANGES \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
        -DMAEMO_CHANGES \

@@ -101,9 +102,7 @@ modest_SOURCES=\
        modest-widget-memory.c\
        modest-widget-memory.h\
        modest-search.c\
        modest-widget-memory.c\
        modest-widget-memory.h\
        modest-search.c\

-       modest-search.h\
-       modest-mime-part-search-stream.c\
-       modest-mime-part-search-stream.h
+       modest-search.h

 
 modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
 modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 
 modest_CFLAGS  = $(MAEMO_LAUNCHER_CFLAGS)
 modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)

@@ -112,10 +111,10 @@ modest_LDADD =                                            \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \

+       $(OGS_LIBS)                                     \

        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la \
        dbus_api/libmodest-dbus-api.la
 
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la \
        dbus_api/libmodest-dbus-api.la
 

-

 EXTRA_DIST=modest-marshal.list
 EXTRA_DIST=modest-marshal.list

diff --git a/src/modest-mime-part-search-stream.c b/src/modest-mime-part-search-stream.c
deleted file mode 100644 (file)
index ea7ef52..0000000
--- a/src/modest-mime-part-search-stream.c
+++ /dev/null
@@ -1,180 +0,0 @@
-#define _GNU_SOURCE
-
-#include <glib.h>
-#include <string.h>
-
-#include "modest-mime-part-search-stream.h"
-
-static GObjectClass *parent_class = NULL;
-
-static gssize
-modest_mime_part_search_stream_read (TnyStream *self, char *buffer, gsize n)
-{
-       ModestMimePartSearchStream *me = (ModestMimePartSearchStream *) self;
-
-       if (strcasestr (buffer, me->search_for) != NULL) {
-               me->found = TRUE;
-               return -1;
-       }
-
-       return (gssize) n;
-}
-
-static gssize
-modest_mime_part_search_stream_write (TnyStream *self, const char *buffer, gsize n)
-{
-       ModestMimePartSearchStream *me = (ModestMimePartSearchStream *) self;
-
-       if (strcasestr (buffer, me->search_for) != NULL) {
-               me->found = TRUE;
-               return -1;
-       }
-
-       return (gssize) n;
-}
-
-static gint
-modest_mime_part_search_stream_flush (TnyStream *self)
-{
-       return 0;
-}
-
-static gint
-modest_mime_part_search_stream_close (TnyStream *self)
-{
-       return 0;
-}
-
-static gboolean
-modest_mime_part_search_stream_is_eos (TnyStream *self)
-{
-       return TRUE;
-}
-
-static gint
-modest_mime_part_search_stream_reset (TnyStream *self)
-{
-       return 0;
-}
-
-static gssize
-modest_mime_part_search_stream_write_to_stream (TnyStream *self, TnyStream *output)
-{
-       char tmp_buf[4096];
-       ssize_t total = 0;
-       ssize_t nb_read;
-       ssize_t nb_written;
-
-       g_assert (TNY_IS_STREAM (output));
-
-       while (G_LIKELY (!tny_stream_is_eos (self))) 
-       {
-               nb_read = tny_stream_read (self, tmp_buf, sizeof (tmp_buf));
-               if (G_UNLIKELY (nb_read < 0))
-                       return -1;
-               else if (G_LIKELY (nb_read > 0)) {
-                       nb_written = 0;
-       
-                       while (G_LIKELY (nb_written < nb_read))
-                       {
-                               ssize_t len = tny_stream_write (output, tmp_buf + nb_written,
-                                                                 nb_read - nb_written);
-                               if (G_UNLIKELY (len < 0))
-                                       return -1;
-                               nb_written += len;
-                       }
-                       total += nb_written;
-               }
-       }
-       return total;
-}
-
-
-TnyStream* 
-modest_mime_part_search_stream_new (const char *search_for)
-{
-       ModestMimePartSearchStream *me = g_object_new (MODEST_TYPE_MIME_PART_SEARCH_STREAM, NULL);
-
-       me->search_for = g_strdup (search_for);
-
-       return TNY_STREAM (me);
-}
-
-static void
-modest_mime_part_search_stream_finalize (GObject *object)
-{
-       ModestMimePartSearchStream *me = g_object_new (MODEST_TYPE_MIME_PART_SEARCH_STREAM, NULL);
-
-       g_free (me->search_for);
-
-       parent_class->finalize (object);
-}
-
-static void
-modest_mime_part_search_stream_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-       ModestMimePartSearchStream *me = (ModestMimePartSearchStream *) instance;
-
-       me->found = FALSE;
-}
-
-static void
-tny_stream_init (TnyStreamIface *klass)
-{
-       klass->read_func = modest_mime_part_search_stream_read;
-       klass->write_func = modest_mime_part_search_stream_write;
-       klass->flush_func = modest_mime_part_search_stream_flush;
-       klass->close_func = modest_mime_part_search_stream_close;
-       klass->is_eos_func = modest_mime_part_search_stream_is_eos;
-       klass->reset_func = modest_mime_part_search_stream_reset;
-       klass->write_to_stream_func = modest_mime_part_search_stream_write_to_stream;
-}
-
-static void
-modest_mime_part_search_stream_class_init (ModestMimePartSearchStreamClass *klass)
-{
-       GObjectClass *object_class;
-
-       parent_class = g_type_class_peek_parent (klass);
-       object_class = (GObjectClass*) klass;
-       object_class->finalize = modest_mime_part_search_stream_finalize;
-}
-
-GType
-modest_mime_part_search_stream_get_type (void)
-{
-       static GType type = 0;
-       if (G_UNLIKELY(type == 0))
-       {
-               static const GTypeInfo info = 
-               {
-                       sizeof (ModestMimePartSearchStreamClass),
-                       NULL,   /* base_init */
-                       NULL,   /* base_finalize */
-                       (GClassInitFunc) modest_mime_part_search_stream_class_init,   /* class_init */
-                       NULL,   /* class_finalize */
-                       NULL,   /* class_data */
-                       sizeof (ModestMimePartSearchStream),
-                       0,      /* n_preallocs */
-                       modest_mime_part_search_stream_instance_init,    /* instance_init */
-                       NULL
-               };
-
-
-               static const GInterfaceInfo tny_stream_info = 
-               {
-                       (GInterfaceInitFunc) tny_stream_init, /* interface_init */
-                       NULL,         /* interface_finalize */
-                       NULL          /* interface_data */
-               };
-
-               type = g_type_register_static (G_TYPE_OBJECT,
-                       "ModestMimePartSearchStream",
-                       &info, 0);
-
-               g_type_add_interface_static (type, TNY_TYPE_STREAM,
-                       &tny_stream_info);
-
-       }
-       return type;
-}

diff --git a/src/modest-mime-part-search-stream.h b/src/modest-mime-part-search-stream.h
deleted file mode 100644 (file)
index d83d2d9..0000000
--- a/src/modest-mime-part-search-stream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef MODEST_MIME_PART_SEARCH_STREAM_H
-#define MODEST_MIME_PART_SEARCH_STREAM_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <tny-stream.h>
-
-G_BEGIN_DECLS
-
-#define MODEST_TYPE_MIME_PART_SEARCH_STREAM             (modest_mime_part_search_stream_get_type ())
-#define MODEST_MIME_PART_SEARCH_STREAM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), MODEST_TYPE_MIME_PART_SEARCH_STREAM, ModestMimePartSearchStream))
-#define MODEST_MIME_PART_SEARCH_STREAM_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), MODEST_TYPE_MIME_PART_SEARCH_STREAM, ModestMimePartSearchStreamClass))
-#define MODEST_IS_MIME_PART_SEARCH_STREAM(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MODEST_TYPE_MIME_PART_SEARCH_STREAM))
-#define MODEST_IS_MIME_PART_SEARCH_STREAM_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), MODEST_TYPE_MIME_PART_SEARCH_STREAM))
-#define MODEST_MIME_PART_SEARCH_STREAM_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), MODEST_TYPE_MIME_PART_SEARCH_STREAM, ModestMimePartSearchStreamClass))
-
-typedef struct _ModestMimePartSearchStream ModestMimePartSearchStream;
-typedef struct _ModestMimePartSearchStreamClass ModestMimePartSearchStreamClass;
-
-struct _ModestMimePartSearchStream
-{
-       GObject parent;
-       gboolean found;
-       gchar *search_for;
-};
-
-struct _ModestMimePartSearchStreamClass 
-{
-       GObjectClass parent;
-};
-
-GType  modest_mime_part_search_stream_get_type (void);
-TnyStream* modest_mime_part_search_stream_new (const char *search_for);
-
-G_END_DECLS
-
-#endif
-

diff --git a/src/modest-search.c b/src/modest-search.c
index a152df3..a2417f5 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -1,5 +1,9 @@
 #define _GNU_SOURCE
 
 #define _GNU_SOURCE
 

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+

 #include <string.h>
 
 #include <tny-shared.h>
 #include <string.h>
 
 #include <tny-shared.h>

@@ -8,8 +12,10 @@
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
 
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
 

+#include "modest-text-utils.h"
+

 #include "modest-search.h"
 #include "modest-search.h"

-#include "modest-mime-part-search-stream.h"
+

 
 static GList*
 add_header (GList *list, TnyHeader *header, TnyFolder *folder)
 
 static GList*
 add_header (GList *list, TnyHeader *header, TnyFolder *folder)

@@ -21,6 +27,184 @@ add_header (GList *list, TnyHeader *header, TnyFolder *folder)
        return g_list_prepend (list, str);
 }
 
        return g_list_prepend (list, str);
 }
 

+static gboolean
+read_chunk (TnyStream *stream, char *buffer, gsize count, gsize *nread)
+{
+       gsize _nread;
+       gssize res;
+
+       _nread = 0;
+       while (_nread < count) {
+               res = tny_stream_read (stream,
+                                      buffer + _nread, 
+                                      count - _nread);
+               if (res == -1) {
+                       *nread = _nread;
+                       return FALSE;
+               }
+
+               if (res == 0)
+                       break;
+
+               _nread += res;
+       }
+
+       *nread = _nread;
+       return TRUE;
+
+
+}
+
+#ifdef MODEST_HAVE_OGS
+static gboolean
+search_mime_part_ogs (TnyMimePart *part, ModestSearch *search)
+{
+       TnyStream *stream;
+       char       buffer[4096];
+       gsize      len;
+       gsize      nread;
+       gboolean   is_html = FALSE;
+       gboolean   found;
+       gboolean   res;
+
+
+       if (! tny_mime_part_content_type_is (part, "text/ *") ||
+           ! (is_html = tny_mime_part_content_type_is (part, "text/html"))) {
+               return FALSE;
+       }
+
+       found = FALSE;
+       len = sizeof (buffer);
+       stream = tny_mime_part_get_stream (part);
+
+       while ((res = read_chunk (stream, buffer, len, &nread))) {
+
+               if (is_html) {
+
+                       found = ogs_text_searcher_search_html (search->text_searcher,
+                                                              buffer,
+                                                              nread,
+                                                              nread < len);
+               } else {
+                       found = ogs_text_searcher_search_text (search->text_searcher,
+                                                              buffer,
+                                                              nread);
+               }
+
+               if (found) {
+                       break;
+               }
+
+       }
+
+       if (!found) {
+               found = ogs_text_searcher_search_done (search->text_searcher);
+       }
+
+       ogs_text_searcher_reset (search->text_searcher);
+
+       return found;
+}
+#endif
+
+static gboolean
+search_mime_part_strcmp (TnyMimePart *part, ModestSearch *search)
+{
+       TnyStream *stream;
+       char       buffer[8193];
+       char      *chunk[2];
+       gsize      len;
+       gssize     nread;
+       gboolean   found;
+       gboolean   res;
+
+       if (! tny_mime_part_content_type_is (part, "text/ *")) {
+               return FALSE;
+       }
+
+       found = FALSE;
+       len = (sizeof (buffer) - 1) / 2;
+
+       if (strlen (search->body) > len) {
+               g_warning ("Search term bigger then chunk."
+                          "We might not find everything");     
+       }
+
+       stream = tny_mime_part_get_stream (part);
+
+       memset (buffer, 0, sizeof (buffer));
+       chunk[0] = buffer;
+       chunk[1] = buffer + len;
+
+       res = read_chunk (stream, chunk[0], len, &nread);
+
+       if (res == FALSE) {
+               goto done;
+       }
+
+       found = !modest_text_utils_utf8_strcmp (search->body,
+                                               buffer,
+                                               TRUE);
+       if (found) {
+               goto done;
+       }
+
+       /* This works like this:
+        * buffer: [ooooooooooo|xxxxxxxxxxxx|\0] 
+        *          ^chunk[0]  ^chunk[1]
+        * we have prefilled chunk[0] now we always read into chunk[1]
+        * and then move the content of chunk[1] to chunk[0].
+        * The idea is to prevent not finding search terms that are
+        * spread across 2 reads:        
+        * buffer: [ooooooooTES|Txxxxxxxxxxx|\0] 
+        * We should catch that because we always search the whole
+        * buffer not only the chunks.
+        *
+        * Of course that breaks for search terms > sizeof (chunk)
+        * but sizeof (chunk) should be big enough I guess (see
+        * the g_warning in this function)
+        * */   
+       while ((res = read_chunk (stream, chunk[1], len, &nread))) {
+               buffer[len + nread] = '\0';
+
+               found = !modest_text_utils_utf8_strcmp (search->body,
+                                                       buffer,
+                                                       TRUE);
+
+               if (found) {
+                       break;
+               }
+
+               /* also move the \0 */
+               g_memmove (chunk[0], chunk[1], len + 1);
+       }
+
+done:
+       g_object_unref (stream);
+       return found;
+}
+
+static gboolean
+search_string (const char      *what,
+              const char      *where,
+              ModestSearch    *search)
+{
+       gboolean found;
+#ifdef MODEST_HAVE_OGS
+       if (search->flags & MODEST_SEARCH_USE_OGS) {
+               found = ogs_text_searcher_search_text (search->text_searcher,
+                                                      where,
+                                                      strlen (where));
+
+               ogs_text_searcher_reset (search->text_searcher);
+       } else {
+#endif
+               found = !modest_text_utils_utf8_strcmp (what, where, TRUE);
+#ifdef MODEST_HAVE_OGS
+       }
+#endif
+       return found;
+}

 
 
 /**
 
 
 /**

@@ -36,14 +220,33 @@ modest_search (TnyFolder *folder, ModestSearch *search)
 {
        GList *retval = NULL;
        TnyIterator *iter;
 {
        GList *retval = NULL;
        TnyIterator *iter;

-       TnyList *list = tny_simple_list_new ();
+       TnyList *list;
+       gboolean (*part_search_func) (TnyMimePart *part, ModestSearch *search);
+
+       part_search_func = search_mime_part_strcmp;
+
+#ifdef MODEST_HAVE_OGS
+       if (search->flags & MODEST_SEARCH_USE_OGS &&
+           search->text_searcher == NULL && search->query != NULL) {
+               OgsTextSearcher *text_searcher; 
+
+               text_searcher = ogs_text_searcher_new (FALSE);
+               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);
 
        iter = tny_list_create_iterator (list);
        tny_folder_get_headers (folder, list, FALSE, NULL);
 
        iter = tny_list_create_iterator (list);

-       while (!tny_iterator_is_done (iter))
-       {
+
+       while (!tny_iterator_is_done (iter)) {

                TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter);
                time_t t = tny_header_get_date_sent (cur);
                TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter);
                time_t t = tny_header_get_date_sent (cur);

+               gboolean found = FALSE;

 
                if (search->flags & MODEST_SEARCH_BEFORE)
                        if (!(t <= search->before))
 
                if (search->flags & MODEST_SEARCH_BEFORE)
                        if (!(t <= search->before))

@@ -53,71 +256,85 @@ modest_search (TnyFolder *folder, ModestSearch *search)
                        if (!(t >= search->after))
                                goto go_next;
 
                        if (!(t >= search->after))
                                goto go_next;
 

-

                if (search->flags & MODEST_SEARCH_SIZE)
                        if (tny_header_get_message_size  (cur) < search->minsize)
                                goto go_next;
                if (search->flags & MODEST_SEARCH_SIZE)
                        if (tny_header_get_message_size  (cur) < search->minsize)
                                goto go_next;

-               
+

                if (search->flags & MODEST_SEARCH_SUBJECT) {
                if (search->flags & MODEST_SEARCH_SUBJECT) {

-                       if (strcasestr (tny_header_get_subject (cur), search->subject))
-                               retval = add_header (retval, cur, folder);
-               } else if (search->flags & MODEST_SEARCH_SENDER) {
-                       if (strcasestr (tny_header_get_from (cur), search->subject))
+                       const char *str = tny_header_get_subject (cur);
+
+                       if ((found = search_string (search->subject, str, search))) {
+                           retval = add_header (retval, cur, folder);
+                       }
+               }
+               
+               if (!found && search->flags & MODEST_SEARCH_SENDER) {
+                       const char *str = tny_header_get_from (cur);
+
+                       if ((found = search_string (search->from, str, search))) {

                                retval = add_header (retval, cur, folder);
                                retval = add_header (retval, cur, folder);

-               } else if (search->flags & MODEST_SEARCH_RECIPIENT) {
-                       if (strcasestr (tny_header_get_to (cur), search->subject))
+                       }
+               }
+               
+               if (!found && search->flags & MODEST_SEARCH_RECIPIENT) {
+                       const char *str = tny_header_get_to (cur);
+
+                       if ((found = search_string (search->recipient, str, search))) {

                                retval = add_header (retval, cur, folder);
                                retval = add_header (retval, cur, folder);

-               } else if (search->flags & MODEST_SEARCH_BODY) 
-               {
-                       TnyHeaderFlags flags = tny_header_get_flags (cur);
-                       
-                       if (flags & TNY_HEADER_FLAG_CACHED)
-                       {
-                               GError *err = NULL;
-                               TnyMsg *msg = tny_folder_get_msg (folder, cur, &err);
-                               
-                               if (err == NULL)
-                               {
-                                       TnyIterator *piter;
-                                       TnyList *parts = tny_simple_list_new ();
-                                       tny_mime_part_get_parts  (TNY_MIME_PART (msg), parts);
-                                       piter = tny_list_create_iterator (parts);
-
-                                       while (!tny_iterator_is_done (piter))
-                                       {
-                                               TnyStream *stream;
-                                               TnyMimePart *pcur = (TnyMimePart *) tny_iterator_get_current (piter);
-
-                                               stream = modest_mime_part_search_stream_new (search->body);
-
-                                               tny_mime_part_decode_to_stream (pcur, stream);
-
-                                               if (((ModestMimePartSearchStream *) stream)->found)
-                                                       retval = add_header (retval, cur, folder);                              
-
-                                               g_object_unref (stream);
-                                               g_object_unref (pcur);
-                                               tny_iterator_next (piter);
-                                       }
-                                       g_object_unref (piter);
-                                       g_object_unref (parts);
-                               } else
-                                       g_error_free (err);
-                               
-                               if (msg)
-                                       g_object_unref (msg);

                        }
                }
                        }
                }

+               
+               if (!found && search->flags & MODEST_SEARCH_BODY) {
+                       TnyHeaderFlags flags;
+                       GError      *err = NULL;
+                       TnyMsg      *msg = NULL;
+                       TnyIterator *piter;
+                       TnyList     *parts;
+
+                       flags = tny_header_get_flags (cur);
+
+                       if (!(flags & TNY_HEADER_FLAG_CACHED)) {
+                               goto go_next;
+                       }
+
+                       msg = tny_folder_get_msg (folder, cur, &err);
+
+                       if (err != NULL || msg == NULL) {
+                               g_warning ("Could not get message\n");
+                               g_error_free (err);
+
+                               if (msg) {
+                                       g_object_unref (msg);
+                               }
+                       }       
+
+                       parts = tny_simple_list_new ();
+                       tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);

 
 

-                       
+                       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))) {
+                                       retval = add_header (retval, cur, folder);                              
+                               }
+
+                               g_object_unref (pcur);
+                               tny_iterator_next (piter);
+                       }
+
+                       g_object_unref (piter);
+                       g_object_unref (parts);
+                       g_object_unref (msg);
+
+               }

 go_next:
                g_object_unref (cur);
                tny_iterator_next (iter);
        }
 go_next:
                g_object_unref (cur);
                tny_iterator_next (iter);
        }

+

        g_object_unref (iter);
        g_object_unref (list);
        g_object_unref (iter);
        g_object_unref (list);

-       

        return retval;
 }
 
        return retval;
 }
 

diff --git a/src/modest-search.h b/src/modest-search.h
index 18f049a..d4a1894 100644 (file)
--- a/src/modest-search.h
+++ b/src/modest-search.h
@@ -1,6 +1,19 @@
 #ifndef MODEST_SEARCH_H
 #define MODEST_SEARCH_H
 
 #ifndef MODEST_SEARCH_H
 #define MODEST_SEARCH_H
 

+#include <glib.h>
+#include <tny-folder.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef MODEST_HAVE_OGS
+#include <libogs/ogs-text-searcher.h>
+#endif
+
+G_BEGIN_DECLS
+

 typedef enum {
        MODEST_SEARCH_SUBJECT   = (1 << 0),
        MODEST_SEARCH_SENDER    = (1 << 1),
 typedef enum {
        MODEST_SEARCH_SUBJECT   = (1 << 0),
        MODEST_SEARCH_SENDER    = (1 << 1),

@@ -8,7 +21,8 @@ typedef enum {
        MODEST_SEARCH_SIZE      = (1 << 3),
        MODEST_SEARCH_BEFORE    = (1 << 4),
        MODEST_SEARCH_AFTER     = (1 << 5),
        MODEST_SEARCH_SIZE      = (1 << 3),
        MODEST_SEARCH_BEFORE    = (1 << 4),
        MODEST_SEARCH_AFTER     = (1 << 5),

-       MODEST_SEARCH_BODY      = (1 << 6)
+       MODEST_SEARCH_BODY      = (1 << 6),
+       MODEST_SEARCH_USE_OGS   = (1 << 7),

 } ModestSearchFlags;
 
 typedef struct {
 } ModestSearchFlags;
 
 typedef struct {

@@ -16,9 +30,15 @@ typedef struct {
        time_t before, after;
        guint minsize;
        ModestSearchFlags flags;
        time_t before, after;
        guint minsize;
        ModestSearchFlags flags;

+#ifdef MODEST_HAVE_OGS
+       const gchar     *query;
+       OgsTextSearcher *text_searcher; 
+#endif

 } ModestSearch;
 
 GList * modest_search (TnyFolder *folder, ModestSearch *search);
 
 } ModestSearch;
 
 GList * modest_search (TnyFolder *folder, ModestSearch *search);
 

+G_END_DECLS
+

 #endif
 
 #endif