* More license declarations

[citadel.git] / citadel / modules / autocompletion / serv_autocompletion.c

diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index ddea4f0dcc0077b015eeb7424b23fe62d2087ef4..d2ab6f5f5f0f06d5a037eac1a4cc82fcef12c61a 100644 (file)
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -2,6 +2,22 @@
  * $Id$
  *
  * Autocompletion of email recipients, etc.
+ *
+ * Copyright (c) 1987-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
  */
 
 #include "sysdep.h"
@@ -29,18 +45,16 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "tools.h"
 #include "msgbase.h"
 #include "user_ops.h"
 #include "room_ops.h"
 #include "database.h"
-#include "vcard.h"
-#include "serv_fulltext.h"
 #include "serv_autocompletion.h"
 
 #include "ctdl_module.h"
@@ -177,7 +191,7 @@ void cmd_auto(char *argbuf) {
                
        if (CtdlAccessCheck(ac_logged_in)) return;
        extract_token(search_string, argbuf, 0, '|', sizeof search_string);
-       if (strlen(search_string) == 0) {
+       if (IsEmptyStr(search_string)) {
                cprintf("%d You supplied an empty partial.\n",
                        ERROR + ILLEGAL_VALUE);
                return;
@@ -205,7 +219,7 @@ void cmd_auto(char *argbuf) {
         * Search-reduce the results if we have the full text index available
         */
        if (config.c_enable_fulltext) {
-               ft_search(&fts_num_msgs, &fts_msgs, search_string);
+               CtdlModuleDoSearch(&fts_num_msgs, &fts_msgs, search_string, "fulltext");
                if (fts_msgs) {
                        for (i=0; i<num_msgs; ++i) {
                                search_match = 0;
@@ -251,8 +265,10 @@ void cmd_auto(char *argbuf) {
 
 
 CTDL_MODULE_INIT(autocompletion) {
-       CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
-
+       if (!threading)
+       {
+               CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
+       }
        /* return our Subversion id for the Log */
        return "$Id$";
 }