X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=681262b4e67aa4aca5c99667d61f94bbed35eb29;hb=67389143a05505c730bdc5fed522274738fe4b42;hp=b5753fbf63c95e4e156082f36da568d6d8ea9485;hpb=079f33bf491a2718e54829da13804d266f935204;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index b5753fbf6..681262b4e 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,11 +1,22 @@ /* - * $Id$ - * * This module handles fulltext indexing of the message base. + * Copyright (c) 2005-2011 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 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 */ - #include "sysdep.h" #include #include @@ -30,6 +41,7 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "citserver.h" @@ -38,22 +50,18 @@ #include "database.h" #include "msgbase.h" #include "control.h" -#include "room_ops.h" -#include "tools.h" #include "serv_fulltext.h" #include "ft_wordbreaker.h" - +#include "threads.h" +#include "context.h" #include "ctdl_module.h" - - long ft_newhighest = 0L; long *ft_newmsgs = NULL; int ft_num_msgs = 0; int ft_num_alloc = 0; - int ftc_num_msgs[65536]; long *ftc_msgs[65536]; @@ -81,8 +89,8 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { - lprintf(CTDL_INFO, - "Flushing index cache to disk (%d%% complete)\n", + syslog(LOG_INFO, + "Flushing index cache to disk (%d%% complete)", (i * 100 / 65536) ); last_update = time(NULL); @@ -95,7 +103,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)"); } @@ -107,29 +115,42 @@ 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", msgnum); + return; + } - lprintf(CTDL_DEBUG, "ft_index_message() %s msg %ld\n", - (op ? "adding" : "removing") , msgnum - ); + if (msg->cm_fields['1'] != NULL) { + syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld", msgnum); + CtdlFreeMessage(msg); + return; + } + + syslog(LOG_DEBUG, "ft_index_message() %s msg %ld", (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...", msgnum); + if ((msgtext == NULL) || (StrLength(msgtext) == 0)) { + syslog(LOG_ALERT, "This message has a zero length. Probable data corruption."); + } + 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]", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; iroom, qrbuf->QRname); + if (server_shutting_down) + 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; static time_t last_index = 0L; static time_t last_progress = 0L; - + time_t run_time = 0L; + time_t end_time = 0L; + static int is_running = 0; + if (is_running) return; /* Concurrency check - only one can run */ + is_running = 1; + /* * Don't do this if the site doesn't have it enabled. */ @@ -231,6 +260,7 @@ void do_fulltext_indexing(void) { * Make sure we don't run the indexer too frequently. * FIXME move the setting into config */ + if ( (time(NULL) - last_index) < 300L) { return; } @@ -239,21 +269,23 @@ 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! */ } - - lprintf(CTDL_DEBUG, "do_fulltext_indexing() started\n"); + + run_time = time(NULL); + syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)", run_time); /* * 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"); + syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d", + CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID + ); + syslog(LOG_INFO, "(re)initializing full text index"); cdb_trunc(CDB_FULLTEXT); CitControl.MMfulltext = 0L; put_control(); @@ -264,7 +296,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); @@ -280,8 +312,8 @@ 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."); ft_newhighest = ft_newmsgs[i]; break; } @@ -310,7 +342,15 @@ void do_fulltext_indexing(void) { ft_num_alloc = 0; ft_newmsgs = NULL; } + end_time = time(NULL); + if (server_shutting_down) { + is_running = 0; + return; + } + + syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)", end_time - run_time); + /* Save our place so we don't have to do this again */ ft_flush_cache(); begin_critical_section(S_CONTROL); @@ -320,34 +360,11 @@ 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"); + is_running = 0; return; } -/* - * Main loop for the indexer thread. - */ -void *indexer_thread(void *arg) { - struct CitContext indexerCC; - - 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 ); - - cdb_allocate_tsd(); - - while (!time_to_die) { - do_fulltext_indexing(); - sleep(1); - } - - lprintf(CTDL_DEBUG, "indexer_thread() exiting\n"); - pthread_exit(NULL); -} - /* @@ -355,7 +372,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; @@ -467,14 +484,30 @@ void initialize_ft_cache(void) { } +void ft_delete_remove(char *room, long msgnum) +{ + if (room) return; + + /* Remove from fulltext index */ + if (config.c_enable_fulltext) { + ft_index_message(msgnum, 0); + } +} + /*****************************************************************************/ CTDL_MODULE_INIT(fulltext) { - initialize_ft_cache(); - CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search"); - CtdlRegisterMaintenanceThread ("indexer", indexer_thread); - - /* return our Subversion id for the Log */ - return "$Id$"; + 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); + CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER); + } + /* return our module name for the log */ + return "fulltext"; }