#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "serv_extensions.h"
#include "database.h"
#include "msgbase.h"
#include "control.h"
#include "ft_wordbreaker.h"
+#include "ctdl_module.h"
+
+
+
long ft_newhighest = 0L;
long *ft_newmsgs = NULL;
int ft_num_msgs = 0;
for (i=0; i<65536; ++i) {
if ((time(NULL) - last_update) >= 10) {
- lprintf(5, "Flushing index cache to disk (%d%% complete)\n",
+ lprintf(CTDL_INFO,
+ "Flushing index cache to disk (%d%% complete)\n",
(i * 100 / 65536)
);
last_update = time(NULL);
ftc_msgs[i] = NULL;
}
}
- lprintf(5, "Cache flush has been completed\n");
+ lprintf(CTDL_INFO, "Flushed index cache to disk (100%% complete)\n");
}
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputMsg(msgnum, MT_CITADEL, HEADERS_ALL, 0, 1);
+ CtdlOutputMsg(msgnum, MT_CITADEL, HEADERS_ALL, 0, 1, NULL);
msgtext = CC->redirect_buffer;
CC->redirect_buffer = NULL;
CC->redirect_len = 0;
wordbreaker(msgtext, &num_tokens, &tokens);
free(msgtext);
- lprintf(CTDL_DEBUG, "Indexing message %ld...\n", msgnum);
+ lprintf(CTDL_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens);
if (num_tokens > 0) {
for (i=0; i<num_tokens; ++i) {
/* search for tokens[i] */
tok = tokens[i];
- /* fetch the bucket, Liza */
- if (ftc_msgs[tok] == NULL) {
- cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tok, sizeof(int));
- if (cdb_bucket != NULL) {
- ftc_num_msgs[tok] = cdb_bucket->len / sizeof(long);
- ftc_msgs[tok] = (long *)cdb_bucket->ptr;
- cdb_bucket->ptr = NULL;
- cdb_free(cdb_bucket);
+ if ( (tok >= 0) && (tok <= 65535) ) {
+ /* fetch the bucket, Liza */
+ if (ftc_msgs[tok] == NULL) {
+ cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tok, sizeof(int));
+ if (cdb_bucket != NULL) {
+ ftc_num_msgs[tok] = cdb_bucket->len / sizeof(long);
+ ftc_msgs[tok] = (long *)cdb_bucket->ptr;
+ cdb_bucket->ptr = NULL;
+ cdb_free(cdb_bucket);
+ }
+ else {
+ ftc_num_msgs[tok] = 0;
+ ftc_msgs[tok] = malloc(sizeof(long));
+ }
}
- else {
- ftc_num_msgs[tok] = 0;
- ftc_msgs[tok] = malloc(sizeof(long));
+
+
+ if (op == 1) { /* add to index */
+ ++ftc_num_msgs[tok];
+ ftc_msgs[tok] = realloc(ftc_msgs[tok],
+ ftc_num_msgs[tok]*sizeof(long));
+ ftc_msgs[tok][ftc_num_msgs[tok] - 1] = msgnum;
}
- }
-
-
- if (op == 1) { /* add to index */
- ++ftc_num_msgs[tok];
- ftc_msgs[tok] = realloc(ftc_msgs[tok],
- ftc_num_msgs[tok]*sizeof(long));
- ftc_msgs[tok][ftc_num_msgs[tok] - 1] = msgnum;
- }
-
- if (op == 0) { /* remove from index */
- if (ftc_num_msgs[tok] >= 1) {
- for (j=0; j<ftc_num_msgs[tok]; ++j) {
- if (ftc_msgs[tok][j] == msgnum) {
- memmove(&ftc_msgs[tok][j], &ftc_msgs[tok][j+1], ((ftc_num_msgs[tok] - j - 1)*sizeof(long)));
- --ftc_num_msgs[tok];
- --j;
+
+ if (op == 0) { /* remove from index */
+ if (ftc_num_msgs[tok] >= 1) {
+ for (j=0; j<ftc_num_msgs[tok]; ++j) {
+ if (ftc_msgs[tok][j] == msgnum) {
+ memmove(&ftc_msgs[tok][j], &ftc_msgs[tok][j+1], ((ftc_num_msgs[tok] - j - 1)*sizeof(long)));
+ --ftc_num_msgs[tok];
+ --j;
+ }
}
}
}
}
-
- /* FIXME do we need to unlock the file here? */
+ else {
+ lprintf(CTDL_ALERT, "Invalid token %d !!\n", tok);
+ }
}
free(tokens);
void ft_index_room(struct ctdlroom *qrbuf, void *data)
{
getroom(&CC->room, qrbuf->QRname);
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, ft_index_msg, NULL);
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, ft_index_msg, NULL);
}
* If we've switched wordbreaker modules, burn the index and start
* over.
*/
+ begin_critical_section(S_CONTROL);
+ lprintf(CTDL_DEBUG, "wb ver on disk = %d, code ver = %d\n",
+ CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID);
if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) {
lprintf(CTDL_INFO, "(re)initializing full text index\n");
cdb_trunc(CDB_FULLTEXT);
CitControl.MMfulltext = 0L;
put_control();
}
+ end_critical_section(S_CONTROL);
/*
* Now go through each room and find messages to index.
/* Here it is ... do each message! */
for (i=0; i<ft_num_msgs; ++i) {
- if ((time(NULL) - last_progress) > 10) {
+ if (time(NULL) != last_progress) {
lprintf(CTDL_DEBUG,
"Indexed %d of %d messages (%d%%)\n",
i, ft_num_msgs,
break;
}
+ /* Check to see if we have to maybe flush to disk */
+ if (i >= FT_MAX_CACHE) {
+ lprintf(CTDL_DEBUG, "Time to flush.\n");
+ ft_newhighest = ft_newmsgs[i];
+ break;
+ }
+
}
free(ft_newmsgs);
/* Save our place so we don't have to do this again */
ft_flush_cache();
+ begin_critical_section(S_CONTROL);
CitControl.MMfulltext = ft_newhighest;
CitControl.fulltext_wordbreaker = FT_WORDBREAKER_ID;
put_control();
+ end_critical_section(S_CONTROL);
last_index = time(NULL);
lprintf(CTDL_DEBUG, "do_fulltext_indexing() finished\n");
/*
- * Tentative form of a search command
+ * This search command is for diagnostic purposes and may be removed or replaced.
*/
void cmd_srch(char *argbuf) {
int num_msgs = 0;
if (!config.c_enable_fulltext) {
cprintf("%d Full text index is not enabled on this server.\n",
ERROR + CMD_NOT_SUPPORTED);
+ return;
}
extract_token(search_string, argbuf, 0, '|', sizeof search_string);
/*****************************************************************************/
-char *serv_fulltext_init(void)
+CTDL_MODULE_INIT(fulltext)
{
initialize_ft_cache();
CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search");
+
+ /* return our Subversion id for the Log */
return "$Id$";
}
projects / citadel.git / blobdiff