* Full text indexer is now switchable on/off

[citadel.git] / citadel / imap_search.c

diff --git a/citadel/imap_search.c b/citadel/imap_search.c
index e42595904b39054c59d6aadc63b49543b035d565..a179a759e283e4e92fbed70b4446f95502224734 100644 (file)
--- a/citadel/imap_search.c
+++ b/citadel/imap_search.c
@@ -1,14 +1,10 @@
 /*
  * $Id$
  *
- * Implements the SEARCH command in IMAP.
- * This command is way too convoluted.  Marc Crispin is a fscking idiot.
- *
- * NOTE: this is a partial implementation.  It is NOT FINISHED.
+ * Implements IMAP's gratuitously complex SEARCH command.
  *
  */
 
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -53,7 +49,7 @@
 #include "imap_fetch.h"
 #include "imap_search.h"
 #include "genstamp.h"
-
+#include "serv_fulltext.h"
 
 
 /*
@@ -77,7 +73,9 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        struct CtdlMessage *msg = NULL;
        int need_to_free_msg = 0;
 
-       if (num_items == 0) return(0);
+       if (num_items == 0) {
+               return(0);
+       }
        msg = supplied_msg;
 
        /* Initially we start at the beginning. */
@@ -217,12 +215,16 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        }
 
        else if (!strcasecmp(itemlist[pos], "NEW")) {
-               /* FIXME */
+               if ( (IMAP->flags[seq-1] & IMAP_RECENT) && (!(IMAP->flags[seq-1] & IMAP_SEEN))) {
+                       match = 1;
+               }
                ++pos;
        }
 
        else if (!strcasecmp(itemlist[pos], "OLD")) {
-               /* FIXME */
+               if (!(IMAP->flags[seq-1] & IMAP_RECENT)) {
+                       match = 1;
+               }
                ++pos;
        }
 
@@ -241,7 +243,9 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        }
 
        else if (!strcasecmp(itemlist[pos], "RECENT")) {
-               /* FIXME */
+               if (IMAP->flags[seq-1] & IMAP_RECENT) {
+                       match = 1;
+               }
                ++pos;
        }
 
@@ -355,7 +359,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        }
 
        else if (!strcasecmp(itemlist[pos], "UID")) {
-               if (is_msg_in_mset(itemlist[pos+1], IMAP->msgids[seq-1])) {
+               if (is_msg_in_sequence_set(itemlist[pos+1], IMAP->msgids[seq-1])) {
                        match = 1;
                }
                pos += 2;
@@ -363,8 +367,8 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
 
        /* Now here come the 'UN' criteria.  Why oh why do we have to
         * implement *both* the 'UN' criteria *and* the 'NOT' keyword?  Why
-        * can't there be *one* way to do things?  Answer: because Mark
-        * Crispin is an idiot.
+        * can't there be *one* way to do things?  Answer: the design of
+        * IMAP suffers from gratuitous complexity.
         */
 
        else if (!strcasecmp(itemlist[pos], "UNANSWERED")) {
@@ -427,7 +431,6 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        }
 
        if (need_to_free_msg) {
-               lprintf(CTDL_DEBUG, "imap search freeing message\n");
                CtdlFreeMessage(msg);
        }
        return(match);
@@ -439,12 +442,50 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
  * validated and boiled down the request a bit.
  */
 void imap_do_search(int num_items, char **itemlist, int is_uid) {
-       int i;
+       int i, j, k;
+       int fts_num_msgs = 0;
+       long *fts_msgs = NULL;
+       int is_in_list = 0;
+
+       /* If there is a BODY search criterion in the query, use our full
+        * text index to disqualify messages that don't have any chance of
+        * matching.  (Only do this if the index is enabled!!)
+        */
+        if (config.c_enable_fulltext) for (i=0; i<(num_items-1); ++i) {
+               if (!strcasecmp(itemlist[i], "BODY")) {
+                       ft_search(&fts_num_msgs, &fts_msgs, itemlist[i+1]);
+                       if (fts_num_msgs > 0) {
+                               for (j=0; j < IMAP->num_msgs; ++j) {
+                                       if (IMAP->flags[j] & IMAP_SELECTED) {
+                                               is_in_list = 0;
+                                               for (k=0; k<fts_num_msgs; ++k) {
+                                                       if (IMAP->msgids[j] == fts_msgs[k]) {
+                                                               ++is_in_list;
+                                                       }
+                                               }
+                                       }
+                                       if (!is_in_list) {
+                                               IMAP->flags[j] = IMAP->flags[j] & ~IMAP_SELECTED;
+                                       }
+                               }
+                       }
+                       else {          /* no hits on the index; disqualify every message */
+                               for (j=0; j < IMAP->num_msgs; ++j) {
+                                       IMAP->flags[j] = IMAP->flags[j] & ~IMAP_SELECTED;
+                               }
+                       }
+                       if (fts_msgs) {
+                               free(fts_msgs);
+                       }
+               }
+       }
 
+       /* Now go through the messages and apply all search criteria. */
+       buffer_output();
        cprintf("* SEARCH ");
        if (IMAP->num_msgs > 0)
         for (i = 0; i < IMAP->num_msgs; ++i)
-         if (IMAP->flags[i] && IMAP_SELECTED) {
+         if (IMAP->flags[i] & IMAP_SELECTED) {
                if (imap_do_search_msg(i+1, NULL, num_items, itemlist, is_uid)) {
                        if (is_uid) {
                                cprintf("%ld ", IMAP->msgids[i]);
@@ -455,6 +496,7 @@ void imap_do_search(int num_items, char **itemlist, int is_uid) {
                }
        }
        cprintf("\r\n");
+       unbuffer_output();
 }
 
 
@@ -469,6 +511,10 @@ void imap_search(int num_parms, char *parms[]) {
                return;
        }
 
+       for (i = 0; i < IMAP->num_msgs; ++i) {
+               IMAP->flags[i] |= IMAP_SELECTED;
+       }
+
        for (i=1; i<num_parms; ++i) {
                if (imap_is_message_set(parms[i])) {
                        imap_pick_range(parms[i], 0);
@@ -490,6 +536,10 @@ void imap_uidsearch(int num_parms, char *parms[]) {
                return;
        }
 
+       for (i = 0; i < IMAP->num_msgs; ++i) {
+               IMAP->flags[i] |= IMAP_SELECTED;
+       }
+
        for (i=1; i<num_parms; ++i) {
                if (imap_is_message_set(parms[i])) {
                        imap_pick_range(parms[i], 1);