* Began writing code to index messages by euid per room

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 8af68336ba3312fb682a2a892587958eceff4dba..68f8d76be4e6a48c7bab8cfbbdf50456c90b5ecc 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 655.18  2005/10/01 05:18:57  ajc
+* Began writing code to index messages by euid per room
+
 Revision 655.17  2005/09/27 04:18:45  ajc
 * Auto-add *recipient* addresses to Contacts.  This is done asynchronously
   because we do have to scan the address book to make sure we don't
@@ -7180,4 +7183,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 0be26f9f2278da2ddda408ed0a17bad42bc44dbc..388dc7d96faca6d80aa716aee915d2bf6a0a5629 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -93,7 +93,7 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        imap_search.c imap_store.c imap_tools.c internet_addressing.c \
        ipc_c_tcp.c locate_host.c md5.c messages.c  serv_autocompletion.c \
        mime_parser.c msgbase.c msgform.c parsedate.c policy.c \
-       room_ops.c rooms.c routines.c routines2.c \
+       room_ops.c rooms.c routines.c routines2.c euidindex.c \
        screen.c sendcommand.c serv_bio.c serv_calendar.c serv_chat.c \
        serv_crypto.c serv_expire.c serv_imap.c serv_inetcfg.c \
        serv_listsub.c serv_mrtg.c serv_netfilter.c serv_network.c \
@@ -133,7 +133,7 @@ SERV_OBJS = server_main.o \
        user_ops.o citserver.o sysdep.o serv_extensions.o \
        tools.o $(DATABASE:.c=.o) domain.o \
        control.o policy.o config.o support.o room_ops.o \
-       file_ops.o msgbase.o \
+       file_ops.o msgbase.o euidindex.o \
        locate_host.o housekeeping.o mime_parser.o html.o \
        internet_addressing.o \
        serv_crypto.o parsedate.o genstamp.o \

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 5908133c96a4b7fa2444bf76b19d0ffd305d1cae..3bca31e77ca845a049816849bf9cb23f22078a0a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -53,6 +53,7 @@
 #include "internet_addressing.h"
 #include "serv_fulltext.h"
 #include "vcard.h"
+#include "euidindex.h"
 
 long config_msgnum;
 struct addresses_to_be_filed *atbf = NULL;

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index e57951ac88c5c9aaedf2474de3e57ce1d3157d26..db92fbf2de04e9e9c1c29a46bc934c3d76208758 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -43,6 +43,7 @@
 #include "msgbase.h"
 #include "tools.h"
 #include "serv_upgrade.h"
+#include "euidindex.h"
 
 
 
@@ -225,5 +226,6 @@ void check_server_upgrades(void) {
 char *serv_upgrade_init(void)
 {
        check_server_upgrades();
+       rebuild_euid_index();   /* FIXME */
        return "$Id$";
 }

diff --git a/citadel/server.h b/citadel/server.h
index 06d7d49ddef5adc9a0718e6ef431ccd3dcd2d24c..06b48fc20edc5a63c3dc4ae645f4bf6157d75322 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -263,6 +263,7 @@ enum {
        CDB_USETABLE,           /* network use table             */
        CDB_BIGMSGS,            /* larger message bodies         */
        CDB_FULLTEXT,           /* full text search index        */
+       CDB_EUIDINDEX,          /* locate msgs by EUID           */
        MAXCDB                  /* total number of CDB's defined */
 };