X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=40645a294b7cdb4eb2e5dba6226adf24f7f91169;hb=5a3c48d2513dab2cec3c32b37e804a891613a909;hp=efd808ab455bb2ff29415d0d5575362f2cd7a596;hpb=0428f9c321bffd2afbd5c41c1170b74d240a5c64;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index efd808ab4..40645a294 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,6 +1,6 @@ /* * This module handles fulltext indexing of the message base. - * Copyright (c) 2005-2011 by the citadel.org team + * Copyright (c) 2005-2017 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 @@ -90,7 +90,7 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { syslog(LOG_INFO, - "Flushing index cache to disk (%d%% complete)", + "fulltext: flushing index cache to disk (%d%% complete)", (i * 100 / 65536) ); last_update = time(NULL); @@ -103,7 +103,7 @@ void ft_flush_cache(void) { ftc_msgs[i] = NULL; } } - syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)"); + syslog(LOG_INFO, "fulltext: flushed index cache to disk (100%% complete)"); } @@ -120,37 +120,36 @@ void ft_index_message(long msgnum, int op) { int tok; struct CtdlMessage *msg = NULL; - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) { - syslog(LOG_ERR, "ft_index_message() could not load msg %ld", msgnum); + syslog(LOG_ERR, "fulltext: ft_index_message() could not load msg %ld", msgnum); return; } - if (msg->cm_fields['1'] != NULL) { - syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld", msgnum); - CtdlFreeMessage(msg); + if (!CM_IsEmpty(msg, eSuppressIdx)) { + syslog(LOG_DEBUG, "fulltext: ft_index_message() excluded msg %ld", msgnum); + CM_Free(msg); return; } - syslog(LOG_DEBUG, "ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum); + syslog(LOG_DEBUG, "fulltext: 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 = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_ALL, 0, 1, 0); - CtdlFreeMessage(msg); + CM_Free(msg); msgtext = CC->redirect_buffer; CC->redirect_buffer = NULL; - syslog(LOG_DEBUG, "Wordbreaking message %ld...", msgnum); - if (StrLength(CC->redirect_buffer) == 0) { - syslog(LOG_ALERT, "This message has a zero length. Probable data corruption."); + if (msgtext != NULL) { + syslog(LOG_DEBUG, "fulltext: wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext)); } txt = SmashStrBuf(&msgtext); wordbreaker(txt, &num_tokens, &tokens); free(txt); - syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]", msgnum, num_tokens); + syslog(LOG_DEBUG, "fulltext: indexing message %ld [%d tokens]", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; i CitControl.MMfulltext) && (msgnum <= ft_newhighest)) { + if ((msgnum > CtdlGetConfigLong("MMfulltext")) && (msgnum <= ft_newhighest)) { ++ft_num_msgs; if (ft_num_msgs > ft_num_alloc) { ft_num_alloc += 1024; @@ -243,16 +242,14 @@ 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. */ - if (!config.c_enable_fulltext) { + if (!CtdlGetConfigInt("c_enable_fulltext")) { return; } @@ -260,8 +257,13 @@ 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) { + time_t now = time(NULL); + if ( (now - last_index) < 300L) { + syslog(LOG_DEBUG, + "fulltext: indexing interval not yet reached; last run was %ldm%lds ago", + ((now - last_index) / 60), + ((now - last_index) % 60) + ); return; } @@ -269,33 +271,32 @@ 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) && (CitControl.fulltext_wordbreaker == FT_WORDBREAKER_ID)) { + if ( + (CtdlGetConfigLong("MMfulltext") >= CtdlGetConfigLong("MMhighest")) + && (CtdlGetConfigInt("MM_fulltext_wordbreaker") == FT_WORDBREAKER_ID) + ) { return; /* nothing to do! */ } - 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); - if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) { - syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d", - CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID + if (CtdlGetConfigInt("MM_fulltext_wordbreaker") != FT_WORDBREAKER_ID) { + syslog(LOG_DEBUG, "fulltext: wb ver on disk = %d, code ver = %d", + CtdlGetConfigInt("MM_fulltext_wordbreaker"), FT_WORDBREAKER_ID ); - syslog(LOG_INFO, "(re)initializing full text index"); + syslog(LOG_INFO, "fulltext: (re)initializing index"); cdb_trunc(CDB_FULLTEXT); - CitControl.MMfulltext = 0L; - put_control(); + CtdlSetConfigLong("MMfulltext", 0); } end_critical_section(S_CONTROL); /* * Now go through each room and find messages to index. */ - ft_newhighest = CitControl.MMhighest; + ft_newhighest = CtdlGetConfigLong("MMhighest"); CtdlForEachRoom(ft_index_room, NULL); /* load all msg pointers */ if (ft_num_msgs > 0) { @@ -313,7 +314,7 @@ void do_fulltext_indexing(void) { for (i=0; i= FT_MAX_CACHE) { - syslog(LOG_DEBUG, "Time to flush."); + syslog(LOG_DEBUG, "fulltext: time to flush."); ft_newhighest = ft_newmsgs[i]; break; } @@ -342,25 +343,21 @@ 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); - CitControl.MMfulltext = ft_newhighest; - CitControl.fulltext_wordbreaker = FT_WORDBREAKER_ID; - put_control(); + CtdlSetConfigLong("MMfulltext", ft_newhighest); + CtdlSetConfigInt("MM_fulltext_wordbreaker", FT_WORDBREAKER_ID); end_critical_section(S_CONTROL); last_index = time(NULL); - syslog(LOG_DEBUG, "do_fulltext_indexing() finished"); + syslog(LOG_DEBUG, "fulltext: indexing finished"); is_running = 0; return; } @@ -415,28 +412,29 @@ void ft_search(int *fts_num_msgs, long **fts_msgs, const char *search_string) { } free(tokens); - qsort(all_msgs, num_all_msgs, sizeof(long), longcmp); - - /* - * 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 (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)) ); + if (all_msgs != NULL) { + qsort(all_msgs, num_all_msgs, sizeof(long), longcmp); + + /* + * 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 (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[num_ret_msgs - 1] = all_msgs[j]; + + } } - ret_msgs[num_ret_msgs - 1] = all_msgs[j]; - - } + free(all_msgs); } - - free(all_msgs); } *fts_num_msgs = num_ret_msgs; @@ -455,7 +453,7 @@ void cmd_srch(char *argbuf) { if (CtdlAccessCheck(ac_logged_in)) return; - if (!config.c_enable_fulltext) { + if (!CtdlGetConfigInt("c_enable_fulltext")) { cprintf("%d Full text index is not enabled on this server.\n", ERROR + CMD_NOT_SUPPORTED); return; @@ -489,7 +487,7 @@ void ft_delete_remove(char *room, long msgnum) if (room) return; /* Remove from fulltext index */ - if (config.c_enable_fulltext) { + if (CtdlGetConfigInt("c_enable_fulltext")) { ft_index_message(msgnum, 0); } } @@ -506,7 +504,7 @@ CTDL_MODULE_INIT(fulltext) CtdlRegisterDeleteHook(ft_delete_remove); CtdlRegisterSearchFuncHook(ft_search, "fulltext"); CtdlRegisterCleanupHook(noise_word_cleanup); - CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER); + CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER, PRIO_CLEANUP + 300); } /* return our module name for the log */ return "fulltext";