rroonga 2.0.8-x86-mingw32 → 2.1.0-x86-mingw32

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86
+prefix=/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/libexec/mecab
+       	echo /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -15,7 +15,7 @@ http {
   keepalive_timeout 65;
 
   # The default groonga database path.
-  groonga_database /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/var/lib/groonga/db/db;
+  groonga_database /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/var/lib/groonga/db/db;
 
   # Create a groonga database automatically if the groonga database doesn't
   # exist.
@@ -37,7 +37,7 @@ http {
     }
 
     location / {
-      root /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/share/groonga/html/admin;
+      root /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/share/groonga/html/admin;
       index index.html;
     }
 

data/vendor/local/include/groonga/groonga.h

@@ -112,7 +112,8 @@ typedef enum {
   GRN_TOO_LARGE_OFFSET = -68,
   GRN_TOO_SMALL_LIMIT = -69,
   GRN_CAS_ERROR = -70,
-  GRN_UNSUPPORTED_COMMAND_VERSION = -71
+  GRN_UNSUPPORTED_COMMAND_VERSION = -71,
+  GRN_NORMALIZER_ERROR = -72,
 } grn_rc;
 
 GRN_API grn_rc grn_init(void);
@@ -563,12 +564,13 @@ GRN_API grn_obj *grn_ctx_db(grn_ctx *ctx);
 /**
  * grn_ctx_get:
  * @name: 検索しようとするオブジェクトの名前。
- * @name_size: @nameのbyte長。
+ * @name_size: The number of bytes of @name. If negative value is specified,
+ *   @name is assumed that NULL-terminated string.
  *
  * ctxが使用するdbからnameに対応するオブジェクトを検索して返す。
  * nameに一致するオブジェクトが存在しなければNULLを返す。
  **/
-GRN_API grn_obj *grn_ctx_get(grn_ctx *ctx, const char *name, unsigned int name_size);
+GRN_API grn_obj *grn_ctx_get(grn_ctx *ctx, const char *name, int name_size);
 
 /**
  * grn_ctx_at:
@@ -608,6 +610,12 @@ typedef enum {
   GRN_DB_TRIGRAM
 } grn_builtin_tokenizer;
 
+typedef enum {
+  GRN_DB_NORMALIZER_AUTO = 96,
+  GRN_DB_NORMALIZER_NFKC51,          /* Normalization Form KC for Unicode 5.1 */
+  GRN_DB_NORMALIZER_UCA              /* Unicode Collation Algorithm */
+} grn_builtin_normalizer;
+
 GRN_API grn_obj *grn_ctx_at(grn_ctx *ctx, grn_id id);
 
 /**
@@ -632,8 +640,8 @@ GRN_API const char *grn_plugin_get_suffix(void);
 /**
  * grn_proc_create:
  * @name: 作成するprocの名前。
- * @name_size: The number of bytes of @name. If -1 is specified, @name
- *             is handled as a NULL terminated string.
+ * @name_size: The number of bytes of @name. If negative value is specified,
+ *   @name is assumed that NULL-terminated string.
  * @type: procの種類。
  * @init: 初期化関数のポインタ
  * @next: 実処理関数のポインタ
@@ -656,7 +664,8 @@ typedef enum {
   GRN_PROC_TOKENIZER = 1,
   GRN_PROC_COMMAND,
   GRN_PROC_FUNCTION,
-  GRN_PROC_HOOK
+  GRN_PROC_HOOK,
+  GRN_PROC_NORMALIZER
 } grn_proc_type;
 
 GRN_API grn_obj *grn_proc_create(grn_ctx *ctx,
@@ -1373,7 +1382,8 @@ typedef enum {
   GRN_INFO_PARTIAL_MATCH_THRESHOLD,
   GRN_INFO_II_SPLIT_THRESHOLD,
   GRN_INFO_SUPPORT_ZLIB,
-  GRN_INFO_SUPPORT_LZO
+  GRN_INFO_SUPPORT_LZO,
+  GRN_INFO_NORMALIZER
 } grn_info_type;
 
 /**
@@ -2069,23 +2079,24 @@ GRN_API grn_log_level grn_default_logger_get_max_level();
   }\
 } while (0)
 
-typedef struct _grn_query_logger_info grn_query_logger_info;
+typedef struct _grn_query_logger grn_query_logger;
 
-struct _grn_query_logger_info {
+struct _grn_query_logger {
   unsigned int flags;
-  grn_user_data *user_data;
+  void *user_data;
   void (*log)(grn_ctx *ctx, unsigned int flag,
               const char *timestamp, const char *info, const char *message,
-              grn_user_data *user_data);
-  void (*reopen)(grn_ctx *ctx, grn_user_data *user_data);
-  void (*fin)(grn_ctx *ctx, grn_user_data *user_data);
+              void *user_data);
+  void (*reopen)(grn_ctx *ctx, void *user_data);
+  void (*fin)(grn_ctx *ctx, void *user_data);
 };
 
-GRN_API grn_rc grn_query_logger_info_set(grn_ctx *ctx, const grn_query_logger_info *info);
+GRN_API grn_rc grn_query_logger_set(grn_ctx *ctx, const grn_query_logger *logger);
 
 GRN_API void grn_query_logger_put(grn_ctx *ctx, unsigned int flag,
                                   const char *mark,
                                   const char *format, ...) GRN_ATTRIBUTE_PRINTF(4);
+GRN_API void grn_query_logger_reopen(grn_ctx *ctx);
 
 GRN_API grn_bool grn_query_logger_pass(grn_ctx *ctx, unsigned int flag);
 

data/vendor/local/include/groonga/groonga/normalizer.h

@@ -0,0 +1,55 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2012 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef GROONGA_NORMALIER_H
+#define GROONGA_NORMALIER_H
+
+#include <stddef.h>
+
+#include <groonga/plugin.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+/*
+  grn_normalizer_register() registers a normalizer to the database
+  which is associated with `ctx'. `name_ptr' and `name_length' specify
+  the normalizer name. `name_length' can be `-1'. `-1' means that
+  `name_ptr` is NULL-terminated. Alphabetic letters ('A'-'Z' and
+  'a'-'z'), digits ('0'-'9') and an underscore ('_') are capable
+  characters. `init', `next' and `fin' specify the normalizer
+  functions. `init' is called for initializing a tokenizer for a
+  document or query. `next' is called for extracting tokens one by
+  one. `fin' is called for finalizing a
+  tokenizer. grn_tokenizer_register() returns GRN_SUCCESS on success,
+  an error code on failure. See "groonga.h" for more details of
+  grn_proc_func and grn_user_data, that is used as an argument of
+  grn_proc_func.
+ */
+GRN_PLUGIN_EXPORT grn_rc grn_normalizer_register(grn_ctx *ctx,
+                                                 const char *name_ptr,
+                                                 int name_length,
+                                                 grn_proc_func *init,
+                                                 grn_proc_func *next,
+                                                 grn_proc_func *fin);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif  /* __cplusplus */
+
+#endif  /* GROONGA_NORMALIER_H */

data/vendor/local/include/groonga/groonga/tokenizer.h

@@ -78,18 +78,23 @@ struct _grn_tokenizer_query {
   const char *ptr;
   unsigned int length;
   grn_encoding encoding;
+  unsigned int flags;
+  grn_bool have_tokenized_delimiter;
 };
 
 /*
   grn_tokenizer_query_open() parses `args' and returns a new object of
   grn_tokenizer_query. The new object stores information of the query.
-  grn_tokenizer_query_create() normalizes the query if the target table
-  requires normalization. grn_tokenizer_query_create() returns NULL if
-  something goes wrong. Note that grn_tokenizer_query_create() must be called
+  grn_tokenizer_query_open() normalizes the query if the target table
+  requires normalization. grn_tokenizer_query_open() returns NULL if
+  something goes wrong. Note that grn_tokenizer_query_open() must be called
   just once in the function that initializes a tokenizer.
+
+  See `GRN_STRING_*' flags for `normalize_flags'.
  */
 GRN_PLUGIN_EXPORT grn_tokenizer_query *grn_tokenizer_query_open(grn_ctx *ctx,
-                                                                int num_args, grn_obj **args);
+                                                                int num_args, grn_obj **args,
+                                                                unsigned int normalize_flags);
 
 /*
   grn_tokenizer_query_create() is deprecated. Use grn_tokenizer_query_open()
@@ -136,16 +141,31 @@ GRN_PLUGIN_EXPORT void grn_tokenizer_token_init(grn_ctx *ctx, grn_tokenizer_toke
 GRN_PLUGIN_EXPORT void grn_tokenizer_token_fin(grn_ctx *ctx, grn_tokenizer_token *token);
 
 /*
-  grn_tokenizer_status provides a list of tokenizer status codes.
-  GRN_TOKENIZER_CONTINUE means that the next token is not the last one and
-  GRN_TOKENIZER_LAST means that the next token is the last one. If a document
-  or query contains no tokens, please push an empty string with
-  GRN_TOKENIZER_LAST as a token.
+ * grn_tokenizer_status is a flag set for tokenizer status codes.
+ * If a document or query contains no tokens, push an empty string with
+ * GRN_TOKENIZER_TOKEN_LAST as a token.
+ */
+typedef unsigned int grn_tokenizer_status;
+
+/* GRN_TOKENIZER_TOKEN_CONTINUE means that the next token is not the last one. */
+#define GRN_TOKENIZER_TOKEN_CONTINUE  (0)
+/* GRN_TOKENIZER_TOKEN_LAST means that the next token is the last one. */
+#define GRN_TOKENIZER_TOKEN_LAST      (0x01L<<0)
+/* GRN_TOKENIZER_TOKEN_OVERLAP means that ... */
+#define GRN_TOKENIZER_TOKEN_OVERLAP   (0x01L<<1)
+/* GRN_TOKENIZER_TOKEN_UNMATURED means that ... */
+#define GRN_TOKENIZER_TOKEN_UNMATURED (0x01L<<2)
+/* GRN_TOKENIZER_TOKEN_REACH_END means that ... */
+#define GRN_TOKENIZER_TOKEN_REACH_END (0x01L<<3)
+
+/*
+ * GRN_TOKENIZER_CONTINUE and GRN_TOKENIZER_LAST are deprecated. They
+ * are just for backward compatibility. Use
+ * GRN_TOKENIZER_TOKEN_CONTINUE and GRN_TOKENIZER_TOKEN_LAST
+ * instead.
  */
-typedef enum {
-  GRN_TOKENIZER_CONTINUE = 0,
-  GRN_TOKENIZER_LAST     = 1
-} grn_tokenizer_status;
+#define GRN_TOKENIZER_CONTINUE GRN_TOKENIZER_TOKEN_CONTINUE
+#define GRN_TOKENIZER_LAST     GRN_TOKENIZER_TOKEN_LAST
 
 /*
   grn_tokenizer_token_push() pushes the next token into `token'. Note that

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -17,7 +17,7 @@ old_library='tsv.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
+dependency_libs=' /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib -lws2_32 /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib -lws2_32 /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/groonga/plugins/suggest'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/suggest'

data/vendor/local/lib/groonga/plugins/table/table.la

@@ -17,7 +17,7 @@ old_library='table.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib -lws2_32 /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la -L/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib -lws2_32 /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/groonga/plugins/table'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/table'

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmecab.la /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libgroonga.la /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
+dependency_libs=' -L/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmecab.la /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/groonga/plugins/tokenizers'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/tokenizers'

data/vendor/local/lib/libgroonga.la

@@ -17,7 +17,7 @@ old_library='libgroonga.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
+dependency_libs=' -L/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/libmecab.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/libmsgpack.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/libmsgpackc.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/pkgconfig/groonga.pc

@@ -1,4 +1,4 @@
-prefix=/home/khayashi/work/groonga/groonga.clean-sub/packages/windows/dist-x86
+prefix=/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
 libdir=${exec_prefix}/lib
@@ -9,10 +9,10 @@ document_root=${datadir}/groonga/html/admin
 pluginsdir=${libdir}/groonga/plugins
 groonga=${bindir}/groonga.exe
 groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
-groonga_version=2.0.9
+groonga_version=2.1.0
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 2.0.9
+Version: 2.1.0
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga