X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=f7861ad03ab16caa14651adf28b72de8000c543d;hb=f1ee61891901850ebbdee1e9440b363dc6df540a;hp=7c76d9d640f7fba95570c91be1b0bbf5eea9ec7d;hpb=5abf3d0c3343809374a116cbe23c808a81a780c4;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index 7c76d9d64..f7861ad03 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,8 +1,20 @@ /* - * $Id$ - * * This module handles fulltext indexing of the message base. + * Copyright (c) 2005-2009 by the citadel.org team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -39,10 +51,10 @@ #include "database.h" #include "msgbase.h" #include "control.h" -#include "room_ops.h" #include "serv_fulltext.h" #include "ft_wordbreaker.h" - +#include "threads.h" +#include "context.h" #include "ctdl_module.h" @@ -81,7 +93,7 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { - lprintf(CTDL_INFO, + syslog(LOG_INFO, "Flushing index cache to disk (%d%% complete)\n", (i * 100 / 65536) ); @@ -95,7 +107,7 @@ void ft_flush_cache(void) { ftc_msgs[i] = NULL; } } - lprintf(CTDL_INFO, "Flushed index cache to disk (100%% complete)\n"); + syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)\n"); } @@ -107,29 +119,41 @@ void ft_index_message(long msgnum, int op) { int *tokens = NULL; int i, j; struct cdbdata *cdb_bucket; - char *msgtext; + StrBuf *msgtext; + char *txt; int tok; + struct CtdlMessage *msg = NULL; + + msg = CtdlFetchMessage(msgnum, 1); + if (msg == NULL) { + syslog(LOG_ERR, "ft_index_message() could not load msg %ld\n", msgnum); + return; + } - lprintf(CTDL_DEBUG, "ft_index_message() %s msg %ld\n", + if (msg->cm_fields['1'] != NULL) { + syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld\n", msgnum); + CtdlFreeMessage(msg); + return; + } + + syslog(LOG_DEBUG, "ft_index_message() %s msg %ld\n", (op ? "adding" : "removing") , msgnum ); /* 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, NULL); + CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); + CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_ALL, 0, 1, 0); + CtdlFreeMessage(msg); 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); + syslog(LOG_DEBUG, "Wordbreaking message %ld...\n", msgnum); + txt = SmashStrBuf(&msgtext); + wordbreaker(txt, &num_tokens, &tokens); + free(txt); - lprintf(CTDL_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens); + syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; iroom, qrbuf->QRname); + if (CtdlThreadCheckStop()) + return; + + CtdlGetRoom(&CC->room, qrbuf->QRname); CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, ft_index_msg, NULL); } /* - * Begin the fulltext indexing process. (Called as an EVT_TIMER event) + * Begin the fulltext indexing process. */ void do_fulltext_indexing(void) { int i; @@ -245,12 +272,12 @@ void do_fulltext_indexing(void) { * 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. */ - if (CitControl.MMfulltext >= CitControl.MMhighest) { + if ((CitControl.MMfulltext >= CitControl.MMhighest) && (CitControl.fulltext_wordbreaker == FT_WORDBREAKER_ID)) { return; /* nothing to do! */ } run_time = time(NULL); - lprintf(CTDL_DEBUG, "do_fulltext_indexing() started (%ld)\n", run_time); + syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)\n", run_time); /* * If we've switched wordbreaker modules, burn the index and start @@ -258,9 +285,9 @@ void do_fulltext_indexing(void) { */ begin_critical_section(S_CONTROL); if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) { - lprintf(CTDL_DEBUG, "wb ver on disk = %d, code ver = %d\n", + syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d\n", CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID); - lprintf(CTDL_INFO, "(re)initializing full text index\n"); + syslog(LOG_INFO, "(re)initializing full text index\n"); cdb_trunc(CDB_FULLTEXT); CitControl.MMfulltext = 0L; put_control(); @@ -271,7 +298,7 @@ void do_fulltext_indexing(void) { * Now go through each room and find messages to index. */ ft_newhighest = CitControl.MMhighest; - ForEachRoom(ft_index_room, NULL); /* load all msg pointers */ + CtdlForEachRoom(ft_index_room, NULL); /* load all msg pointers */ if (ft_num_msgs > 0) { qsort(ft_newmsgs, ft_num_msgs, sizeof(long), longcmp); @@ -287,7 +314,7 @@ void do_fulltext_indexing(void) { /* Here it is ... do each message! */ for (i=0; i= FT_MAX_CACHE) { - lprintf(CTDL_DEBUG, "Time to flush.\n"); + syslog(LOG_DEBUG, "Time to flush.\n"); ft_newhighest = ft_newmsgs[i]; break; } @@ -318,8 +345,12 @@ void do_fulltext_indexing(void) { ft_newmsgs = NULL; } end_time = time(NULL); - lprintf(CTDL_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + if (CtdlThreadCheckStop()) + return; + + syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + /* Save our place so we don't have to do this again */ ft_flush_cache(); begin_critical_section(S_CONTROL); @@ -329,7 +360,7 @@ void do_fulltext_indexing(void) { end_critical_section(S_CONTROL); last_index = time(NULL); - lprintf(CTDL_DEBUG, "do_fulltext_indexing() finished\n"); + syslog(LOG_DEBUG, "do_fulltext_indexing() finished\n"); return; } @@ -339,21 +370,18 @@ void do_fulltext_indexing(void) { void *indexer_thread(void *arg) { struct CitContext indexerCC; - CtdlThreadAllocTSD(); - - lprintf(CTDL_DEBUG, "indexer_thread() initializing\n"); - memset(&indexerCC, 0, sizeof(struct CitContext)); - indexerCC.internal_pgm = 1; - indexerCC.cs_pid = 0; - pthread_setspecific(MyConKey, (void *)&indexerCC ); + CtdlFillSystemContext(&indexerCC, "indexer"); + citthread_setspecific(MyConKey, (void *)&indexerCC ); + syslog(LOG_DEBUG, "indexer_thread() initializing\n"); while (!CtdlThreadCheckStop()) { do_fulltext_indexing(); CtdlThreadSleep(300); } - lprintf(CTDL_DEBUG, "indexer_thread() exiting\n"); + syslog(LOG_DEBUG, "indexer_thread() exiting\n"); + CtdlClearSystemContext(); return NULL; } @@ -364,7 +392,7 @@ void *indexer_thread(void *arg) { * (This one does the "all of these words" search.) * Caller is responsible for freeing the message list. */ -void ft_search(int *fts_num_msgs, long **fts_msgs, char *search_string) { +void ft_search(int *fts_num_msgs, long **fts_msgs, const char *search_string) { int num_tokens = 0; int *tokens = NULL; int i, j; @@ -493,14 +521,16 @@ CTDL_MODULE_INIT(fulltext) if (!threading) { initialize_ft_cache(); + initialize_noise_words(); CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search"); CtdlRegisterDeleteHook(ft_delete_remove); CtdlRegisterSearchFuncHook(ft_search, "fulltext"); + CtdlRegisterCleanupHook(noise_word_cleanup); } else { CtdlThreadCreate("Indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL); } /* return our Subversion id for the Log */ - return "$Id$"; + return "fulltext"; }