* Index or de-index a message. (op == 1 to index, 0 to de-index)
*/
void ft_index_message(long msgnum, int op) {
- struct CtdlMessage *msg;
int num_tokens = 0;
int *tokens = NULL;
int i, j;
struct cdbdata *cdb_bucket;
int num_msgs;
long *msgs;
+ char *msgtext;
lprintf(CTDL_DEBUG, "ft_index_message() %s msg %ld\n",
(op ? "adding" : "removing") , msgnum
);
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg == NULL) return;
-
- if (msg->cm_fields['M'] != NULL) {
- wordbreaker(msg->cm_fields['M'], &num_tokens, &tokens);
- }
- CtdlFreeMessage(msg);
-
+ /* Output the message as text before indexing it, so we don't end up
+ * indexing a bunch of encoded base64, etc.
+ */
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
+ CtdlOutputMsg(msgnum, MT_CITADEL, HEADERS_ALL, 0, 1);
+ msgtext = CC->redirect_buffer;
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+ lprintf(CTDL_DEBUG, "Wordbreaking message %ld...\n", msgnum);
+ wordbreaker(msgtext, &num_tokens, &tokens);
+ free(msgtext);
+
+ lprintf(CTDL_DEBUG, "Indexing message %ld...\n", msgnum);
if (num_tokens > 0) {
for (i=0; i<num_tokens; ++i) {
msgs = (long *) cdb_bucket->ptr;
for (j=0; j<num_msgs; ++j) {
if (msgs[j] == msgnum) {
- lprintf(CTDL_DEBUG, "nix0ring %ld\n", msgs[j]);
- memmove(&msgs[j], &msgs[j+1],
- ((num_msgs - j - 1)*sizeof(long)));
+ memmove(&msgs[j], &msgs[j+1], ((num_msgs - j - 1)*sizeof(long)));
--num_msgs;
+ --j;
}
}
}
}
- /* sort and purge dups */
+ /* sort and purge dups
+ *
+ * This whole section is commented out because it's
+ * no longer needed -- since the tokenizer already
+ * does a merge/purge on the tokens it returns, and
+ * we're guaranteed to always be indexing a message
+ * with a number higher than any already in the index.
+ *
if ( (op == 1) && (num_msgs > 1) ) {
msgs = (long *) cdb_bucket->ptr;
qsort(msgs, num_msgs, sizeof(long), longcmp);
for (j=0; j<(num_msgs-1); ++j) {
if (msgs[j] == msgs[j+1]) {
- memmove(&msgs[j], &msgs[j+1],
- ((num_msgs - j - 1)*sizeof(long)));
+ memmove(&msgs[j], &msgs[j+1], ((num_msgs - j - 1)*sizeof(long)));
--num_msgs;
+ --j;
}
}
}
+ */
cdb_store(CDB_FULLTEXT, &tokens[i], sizeof(int),
msgs, (num_msgs*sizeof(long)) );
void do_fulltext_indexing(void) {
int i;
static time_t last_index = 0L;
+ static time_t last_progress = 0L;
+
+ /*
+ * Don't do this if the site doesn't have it enabled.
+ */
+ if (!config.c_enable_fulltext) {
+ return;
+ }
/*
* Make sure we don't run the indexer too frequently.
* Check to see whether the fulltext index is up to date; if there
* are no messages to index, don't waste any more time trying.
*/
- lprintf(CTDL_DEBUG, "CitControl.MMhighest = %ld\n", CitControl.MMhighest);
- lprintf(CTDL_DEBUG, "CitControl.MMfulltext = %ld\n", CitControl.MMfulltext);
if (CitControl.MMfulltext >= CitControl.MMhighest) {
- /* nothing to do! */
- return;
+ return; /* nothing to do! */
}
lprintf(CTDL_DEBUG, "do_fulltext_indexing() started\n");
memmove(&ft_newmsgs[i], &ft_newmsgs[i+1],
((ft_num_msgs - i - 1)*sizeof(long)));
--ft_num_msgs;
+ --i;
}
}
/* Here it is ... do each message! */
for (i=0; i<ft_num_msgs; ++i) {
+ if ((time(NULL) - last_progress) > 10) {
+ lprintf(CTDL_DEBUG,
+ "Indexed %d of %d messages (%d%%)\n",
+ i, ft_num_msgs,
+ ((i*100) / ft_num_msgs)
+ );
+ last_progress = time(NULL);
+ }
ft_index_message(ft_newmsgs[i], 1);
}
for (i=0; i<num_tokens; ++i) {
/* search for tokens[i] */
- cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tokens[i], sizeof(int));
+ cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tokens[i],
+ sizeof(int));
if (cdb_bucket != NULL) {
num_msgs = cdb_bucket->len / sizeof(long);
msgs = (long *)cdb_bucket->ptr;
num_all_msgs += num_msgs;
if (num_all_msgs > 0) {
- all_msgs = realloc(all_msgs, num_all_msgs*sizeof(long) );
- memcpy(&all_msgs[num_all_msgs - num_msgs], msgs,
- num_msgs*sizeof(long) );
+ all_msgs = realloc(all_msgs,
+ num_all_msgs*sizeof(long) );
+ memcpy(&all_msgs[num_all_msgs-num_msgs],
+ msgs, num_msgs*sizeof(long) );
}
cdb_free(cdb_bucket);
* At this point, if a message appears num_tokens times in the
* list, then it contains all of the search tokens.
*/
- if (num_all_msgs >= num_tokens) for (j=0; j<(num_all_msgs-num_tokens+1); ++j) {
+ if (num_all_msgs >= num_tokens)
+ for (j=0; j<(num_all_msgs-num_tokens+1); ++j) {
if (all_msgs[j] == all_msgs[j+num_tokens-1]) {
++num_ret_msgs;
if (num_ret_msgs > num_ret_alloc) {
num_ret_alloc += 64;
- ret_msgs = realloc(ret_msgs, (num_ret_alloc*sizeof(long)) );
+ ret_msgs = realloc(ret_msgs,
+ (num_ret_alloc*sizeof(long)) );
}
ret_msgs[num_ret_msgs - 1] = all_msgs[j];
char search_string[256];
if (CtdlAccessCheck(ac_logged_in)) return;
+
+ if (!config.c_enable_fulltext) {
+ cprintf("%d Full text index is not enabled on this server.\n",
+ ERROR + CMD_NOT_SUPPORTED);
+ }
+
extract_token(search_string, argbuf, 0, '|', sizeof search_string);
ft_search(&num_msgs, &msgs, search_string);
char *serv_fulltext_init(void)
{
CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER);
- CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search");
+ CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search");
return "$Id$";
}
projects / citadel.git / blobdiff