X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=7f5da0fe84d604863b3ba68567a1f4d73d7fd570;hp=6288bfc9ab99adb0a240c99b739aab54da32622e;hb=a46e719c5c6252c1342acb5f2d5ac96f8778759a;hpb=87ee9a0f75accba322337ca909ea51c0d52d8370 diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index 6288bfc9a..7f5da0fe8 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-2015 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 @@ -268,7 +268,7 @@ 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 ((CitControl.MMfulltext >= CitControl.MMhighest) && (CitControl.MM_fulltext_wordbreaker == FT_WORDBREAKER_ID)) { return; /* nothing to do! */ } @@ -280,9 +280,9 @@ void do_fulltext_indexing(void) { * over. */ begin_critical_section(S_CONTROL); - if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) { + if (CitControl.MM_fulltext_wordbreaker != FT_WORDBREAKER_ID) { syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d", - CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID + CitControl.MM_fulltext_wordbreaker, FT_WORDBREAKER_ID ); syslog(LOG_INFO, "(re)initializing full text index"); cdb_trunc(CDB_FULLTEXT); @@ -354,7 +354,7 @@ void do_fulltext_indexing(void) { ft_flush_cache(); begin_critical_section(S_CONTROL); CitControl.MMfulltext = ft_newhighest; - CitControl.fulltext_wordbreaker = FT_WORDBREAKER_ID; + CitControl.MM_fulltext_wordbreaker = FT_WORDBREAKER_ID; put_control(); end_critical_section(S_CONTROL); last_index = time(NULL);