HUGE PATCH. This moves all of mime_parser.c and all

[citadel.git] / citadel / euidindex.c

diff --git a/citadel/euidindex.c b/citadel/euidindex.c
index abab0383e49906b9561c1a613b73073174a962be..1e87e25d226cf9134d6a141afa7dd80b4ca7c390 100644 (file)
--- a/citadel/euidindex.c
+++ b/citadel/euidindex.c
@@ -29,9 +29,9 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "database.h"
 #include "msgbase.h"
 #include "support.h"
@@ -42,7 +42,6 @@
 #include "file_ops.h"
 #include "config.h"
 #include "control.h"
-#include "tools.h"
 #include "euidindex.h"
 
 /*
@@ -60,6 +59,31 @@
  */
 
 
+
+/*
+ * Return nonzero if the supplied room is one which should have
+ * an EUID index.
+ */
+int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) {
+
+       switch(qrbuf->QRdefaultview) {
+               case VIEW_BBS:          return(0);
+               case VIEW_MAILBOX:      return(0);
+               case VIEW_ADDRESSBOOK:  return(1);
+               case VIEW_CALENDAR:     return(1);
+               case VIEW_TASKS:        return(1);
+               case VIEW_NOTES:        return(1);
+               case VIEW_WIKI:         return(1);
+       }
+       
+       return(0);
+}
+
+
+
+
+
+
 /*
  * Locate a message in a given room with a given euid, and return
  * its message number.
@@ -129,7 +153,7 @@ void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum) {
  * Called by rebuild_euid_index_for_room() to index one message.
  */
 void rebuild_euid_index_for_msg(long msgnum, void *userdata) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
 
        msg = CtdlFetchMessage(msgnum, 0);
        if (msg == NULL) return;
@@ -162,9 +186,14 @@ void rebuild_euid_index_for_room(struct ctdlroom *qrbuf, void *data) {
 
        while (rplist != NULL) {
                if (getroom(&qr, rplist->name) == 0) {
-                       lprintf(CTDL_DEBUG, "Rebuilding EUID index for <%s>\n", rplist->name);
-                       usergoto(rplist->name, 0, 0, NULL, NULL);
-                       CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, rebuild_euid_index_for_msg, NULL);
+                       if (DoesThisRoomNeedEuidIndexing(&qr)) {
+                               lprintf(CTDL_DEBUG,
+                                       "Rebuilding EUID index for <%s>\n",
+                                       rplist->name);
+                               usergoto(rplist->name, 0, 0, NULL, NULL);
+                               CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
+                                       rebuild_euid_index_for_msg, NULL);
+                       }
                }
                ptr = rplist;
                rplist = rplist->next;
@@ -177,9 +206,9 @@ void rebuild_euid_index_for_room(struct ctdlroom *qrbuf, void *data) {
  * Globally rebuild the EUID indices in every room.
  */
 void rebuild_euid_index(void) {
-       cdb_trunc(CDB_EUIDINDEX);                       /* delete the old indices */
-       ForEachRoom(rebuild_euid_index_for_room, NULL); /* enumerate the room names */
-       rebuild_euid_index_for_room(NULL, NULL);        /* now do indexing on them */
+       cdb_trunc(CDB_EUIDINDEX);               /* delete the old indices */
+       ForEachRoom(rebuild_euid_index_for_room, NULL); /* enumerate rm names */
+       rebuild_euid_index_for_room(NULL, NULL);        /* and index them */
 }