X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Feuidindex.c;h=95c7c77a792fe05b885f685a5048cf19696fb525;hb=0fadbcbe2c27134ad71634b9c81d277d118eff17;hp=ce9ebd350d1f22ae4b14772c7570b675d0b704e0;hpb=a2fda4eafb51bbf58c04471522aa2d0f116c797e;p=citadel.git

diff --git a/citadel/euidindex.c b/citadel/euidindex.c
index ce9ebd350..95c7c77a7 100644
--- a/citadel/euidindex.c
+++ b/citadel/euidindex.c
@@ -1,48 +1,13 @@
 /*
- * $Id$
- *
  * Index messages by EUID per room.
- *
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
 #include <libcitadel.h>
-#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"
 
 /*
  * The structure of an euidindex record *key* is:
@@ -70,10 +35,13 @@ 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);
@@ -89,12 +57,16 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) {
  * 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);
@@ -114,7 +86,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);
 }
 
@@ -129,7 +101,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: ndexing message #%ld <%s> in <%s>", msgnum, euid, qrbuf->QRname);
 
 	key_len = strlen(euid) + sizeof(long) + 1;
 	key = malloc(key_len);
@@ -155,12 +127,12 @@ void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum) {
 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);
 }
 
 
@@ -169,7 +141,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.
 	 */
@@ -185,12 +157,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);
 			}
@@ -207,7 +179,7 @@ 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 */
 }
 
@@ -224,10 +196,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;
@@ -250,4 +222,11 @@ void cmd_euid(char *cmdbuf) {
 	cprintf("%d not found\n", ERROR + MESSAGE_NOT_FOUND);
 }
 
-
+CTDL_MODULE_INIT(euidindex)
+{
+	if (!threading) {
+		CtdlRegisterProtoHook(cmd_euid, "EUID", "Perform operations on Extended IDs for messages");
+	}
+	/* return our Subversion id for the Log */
+	return "euidindex";
+}