null+****@clear*****
null+****@clear*****
2010年 8月 20日 (金) 14:28:51 JST
Daijiro MORI 2010-08-20 05:28:51 +0000 (Fri, 20 Aug 2010)
New Revision: 8f286f523fc16abfcd8e432c1bccd9e28a08fe64
Log:
Moved suggest.so to suggest directory.
Removed files:
modules/functions/cast.c
Modified files:
configure.ac
modules/Makefile.am
Renamed files:
modules/suggest/Makefile.am
(from modules/functions/Makefile.am)
modules/suggest/suggest.c
(from modules/functions/suggest.c)
Modified: configure.ac (+3 -3)
===================================================================
--- configure.ac 2010-08-19 15:17:06 +0000 (0905230)
+++ configure.ac 2010-08-20 05:28:51 +0000 (c2c1944)
@@ -91,7 +91,7 @@ AC_CONFIG_FILES([Makefile
lib/Makefile
modules/Makefile
modules/tokenizers/Makefile
- modules/functions/Makefile
+ modules/suggest/Makefile
examples/Makefile
apt/Makefile
data/Makefile
@@ -575,8 +575,8 @@ AC_SUBST(modulesdir)
tokenizer_modulesdir="\${modulesdir}/tokenizers"
AC_SUBST(tokenizer_modulesdir)
-function_modulesdir="\${modulesdir}/functions"
-AC_SUBST(function_modulesdir)
+suggest_modulesdir="\${modulesdir}/suggest"
+AC_SUBST(suggest_modulesdir)
AC_MSG_CHECKING(for the suffix of module shared libraries)
shrext_cmds=$(./libtool --config | grep '^shrext_cmds=')
Modified: modules/Makefile.am (+1 -1)
===================================================================
--- modules/Makefile.am 2010-08-19 15:17:06 +0000 (fdbb8e0)
+++ modules/Makefile.am 2010-08-20 05:28:51 +0000 (39e9ed8)
@@ -1,3 +1,3 @@
SUBDIRS = \
tokenizers \
- functions
+ suggest
Deleted: modules/functions/cast.c (+0 -54) 100644
===================================================================
--- modules/functions/cast.c 2010-08-19 15:17:06 +0000 (5aa590d)
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c-basic-offset: 2 -*- */
-/* Copyright(C) 2010 Brazil
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "proc.h"
-#include "ql.h"
-#include "db.h"
-#include "util.h"
-
-static grn_obj *
-func_cast(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
-{
- grn_obj *obj;
- if (nargs == 2 && GRN_DB_OBJP(args[1])) {
- obj = GRN_PROC_ALLOC(DB_OBJ(args[1])->id, 0);
- grn_obj_cast(ctx, args[0], obj, 0);
- } else {
- obj = GRN_PROC_ALLOC(GRN_DB_INT32, 0);
- }
- return obj;
-}
-
-grn_rc
-grn_module_init_cast(grn_ctx *ctx)
-{
- return GRN_SUCCESS;
-}
-
-grn_rc
-grn_module_register_cast(grn_ctx *ctx)
-{
- grn_proc_create(ctx, "cast", 4, GRN_PROC_FUNCTION, func_cast, NULL, NULL, 0, NULL);
-
- return ctx->rc;
-}
-
-grn_rc
-grn_module_fin_cast(grn_ctx *ctx)
-{
- return GRN_SUCCESS;
-}
Renamed: modules/suggest/Makefile.am (+1 -2) 75%
===================================================================
--- modules/functions/Makefile.am 2010-08-19 15:17:06 +0000 (fa8b1dd)
+++ modules/suggest/Makefile.am 2010-08-20 05:28:51 +0000 (caa664f)
@@ -11,7 +11,6 @@ AM_LDFLAGS = \
LIBS = \
$(top_builddir)/lib/libgroonga.la
-function_modules_LTLIBRARIES = cast.la suggest.la
+suggest_modules_LTLIBRARIES = suggest.la
-cast_la_SOURCES = cast.c
suggest_la_SOURCES = suggest.c
Renamed: modules/suggest/suggest.c (+0 -0) 100%
===================================================================