Rewrite of the indexer is complete!

[citadel.git] / citadel / server / modules / fulltext / serv_fulltext.c

diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c
index ede6fb35592584070a91a06635d8f9d718995c12..7f7dd7959b2a984eb91eb41e1873fed92bcf45ab 100644 (file)
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -249,7 +249,7 @@ void do_fulltext_indexing(void) {
 // API call to perform searches.
 // (This one does the "all of these words" search.)
 // Caller is responsible for freeing the message list.
-Array *ft_search(const char *search_string) {
+Array *CtdlFullTextSearch(const char *search_string) {
        int i, j, tok;
        struct cdbdata cdb_bucket;
        long msgnum, smsgnum;
@@ -313,7 +313,7 @@ void cmd_srch(char *argbuf) {
        }
 
        extract_token(search_string, argbuf, 0, '|', sizeof search_string);
-       matches = ft_search(search_string);
+       matches = CtdlFullTextSearch(search_string);
 
        cprintf("%d %d msgs match all search words:\n", LISTING_FOLLOWS, array_len(matches));
        if ((matches != NULL) && (array_len(matches) > 0)) {
@@ -344,7 +344,6 @@ char *ctdl_module_init_fulltext(void) {
        if (!threading) {
                CtdlRegisterProtoHook(cmd_srch, "SRCH", "Full text search");
                CtdlRegisterDeleteHook(ft_delete_remove);
-               //CtdlRegisterSearchFuncHook(ft_search, "fulltext");
                CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER, PRIO_CLEANUP + 300);
        }
        // return our module name for the log