X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Feuidindex.c;h=8533caabf85a6099e7ed32463341265b27691b36;hb=c71df26b9d35c07eb9c1322a7e83caa86337ad82;hp=2dac3730fd79a66e1e509d4f8164fe73abc20303;hpb=f95401b73d6f0c34dd00639be58fa8731e6959e9;p=citadel.git diff --git a/citadel/euidindex.c b/citadel/euidindex.c index 2dac3730f..8533caabf 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -1,50 +1,23 @@ -/* - * $Id$ - * +/* * Index messages by EUID per room. * + * Copyright (c) 1987-2019 by the citadel.org team + * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "sysdep.h" -#include -#include #include -#include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - - -#include -#include -#include -#include -#include -#include #include -#include "citadel.h" -#include "server.h" -#include "database.h" -#include "msgbase.h" -#include "support.h" -#include "sysdep_decls.h" + #include "citserver.h" #include "room_ops.h" -#include "user_ops.h" -#include "file_ops.h" -#include "config.h" -#include "control.h" -#include "euidindex.h" - -#include "ctdl_module.h" /* * The structure of an euidindex record *key* is: @@ -60,8 +33,6 @@ * */ - - /* * Return nonzero if the supplied room is one which should have * an EUID index. @@ -72,31 +43,35 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) { case VIEW_BBS: return(0); case VIEW_MAILBOX: return(0); case VIEW_ADDRESSBOOK: return(1); + case VIEW_DRAFTS: return(0); case VIEW_CALENDAR: return(1); case VIEW_TASKS: return(1); case VIEW_NOTES: return(1); case VIEW_WIKI: return(1); + case VIEW_WIKIMD: return(1); + case VIEW_BLOG: return(1); } return(0); } - - - - /* * Locate a message in a given room with a given euid, and return * its message number. */ long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) { + return CtdlLocateMessageByEuid (euid, qrbuf); +} + + +long CtdlLocateMessageByEuid(char *euid, struct ctdlroom *qrbuf) { char *key; int key_len; struct cdbdata *cdb_euid; long msgnum = (-1L); - CtdlLogPrintf(CTDL_DEBUG, "Searching for EUID <%s> in <%s>\n", euid, qrbuf->QRname); + syslog(LOG_DEBUG, "euidindex: searching for EUID <%s> in <%s>", euid, qrbuf->QRname); key_len = strlen(euid) + sizeof(long) + 1; key = malloc(key_len); @@ -116,7 +91,7 @@ long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) { memcpy(&msgnum, cdb_euid->ptr, sizeof(long)); cdb_free(cdb_euid); } - CtdlLogPrintf(CTDL_DEBUG, "returning msgnum = %ld\n", msgnum); + syslog(LOG_DEBUG, "euidindex: returning msgnum = %ld", msgnum); return(msgnum); } @@ -131,7 +106,7 @@ void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum) { char *data; int data_len; - CtdlLogPrintf(CTDL_DEBUG, "Indexing message #%ld <%s> in <%s>\n", msgnum, euid, qrbuf->QRname); + syslog(LOG_DEBUG, "euidindex: indexing message #%ld <%s> in <%s>", msgnum, euid, qrbuf->QRname); key_len = strlen(euid) + sizeof(long) + 1; key = malloc(key_len); @@ -150,19 +125,18 @@ 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 = NULL; - msg = CtdlFetchMessage(msgnum, 0); + msg = CtdlFetchMessage(msgnum, 0, 1); if (msg == NULL) return; - if (msg->cm_fields['E'] != NULL) { - index_message_by_euid(msg->cm_fields['E'], &CC->room, msgnum); + if (!CM_IsEmpty(msg, eExclusiveID)) { + index_message_by_euid(msg->cm_fields[eExclusiveID], &CC->room, msgnum); } - CtdlFreeMessage(msg); + CM_Free(msg); } @@ -171,7 +145,7 @@ void rebuild_euid_index_for_room(struct ctdlroom *qrbuf, void *data) { struct RoomProcList *ptr; struct ctdlroom qr; - /* Lazy programming here. Call this function as a ForEachRoom backend + /* Lazy programming here. Call this function as a CtdlForEachRoom backend * in order to queue up the room names, or call it with a null room * to make it do the processing. */ @@ -187,12 +161,12 @@ void rebuild_euid_index_for_room(struct ctdlroom *qrbuf, void *data) { } while (rplist != NULL) { - if (getroom(&qr, rplist->name) == 0) { + if (CtdlGetRoom(&qr, rplist->name) == 0) { if (DoesThisRoomNeedEuidIndexing(&qr)) { - CtdlLogPrintf(CTDL_DEBUG, - "Rebuilding EUID index for <%s>\n", + syslog(LOG_DEBUG, + "euidindex: rebuilding EUID index for <%s>", rplist->name); - usergoto(rplist->name, 0, 0, NULL, NULL); + CtdlUserGoto(rplist->name, 0, 0, NULL, NULL, NULL, NULL); CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, rebuild_euid_index_for_msg, NULL); } @@ -209,12 +183,11 @@ void rebuild_euid_index_for_room(struct ctdlroom *qrbuf, void *data) { */ void rebuild_euid_index(void) { cdb_trunc(CDB_EUIDINDEX); /* delete the old indices */ - ForEachRoom(rebuild_euid_index_for_room, NULL); /* enumerate rm names */ + CtdlForEachRoom(rebuild_euid_index_for_room, NULL); /* enumerate rm names */ rebuild_euid_index_for_room(NULL, NULL); /* and index them */ } - /* * Server command to fetch a message number given an euid. */ @@ -226,10 +199,10 @@ void cmd_euid(char *cmdbuf) { int num_msgs = 0; int i; - if (CtdlAccessCheck(ac_logged_in)) return; + if (CtdlAccessCheck(ac_logged_in_or_guest)) return; extract_token(euid, cmdbuf, 0, '|', sizeof euid); - msgnum = locate_message_by_euid(euid, &CC->room); + msgnum = CtdlLocateMessageByEuid(euid, &CC->room); if (msgnum <= 0L) { cprintf("%d not found\n", ERROR + MESSAGE_NOT_FOUND); return; @@ -252,9 +225,12 @@ void cmd_euid(char *cmdbuf) { cprintf("%d not found\n", ERROR + MESSAGE_NOT_FOUND); } + CTDL_MODULE_INIT(euidindex) { - CtdlRegisterProtoHook(cmd_euid, "EUID", "Autoconverted. TODO: document me."); + if (!threading) { + CtdlRegisterProtoHook(cmd_euid, "EUID", "Perform operations on Extended IDs for messages"); + } /* return our Subversion id for the Log */ - return "$Id$"; + return "euidindex"; }