rroonga 2.0.4-x86-mingw32 → 2.0.7-x86-mingw32

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

@@ -414,6 +414,7 @@ typedef unsigned short int grn_obj_flags;
 #define GRN_ACCESSOR_VIEW              (0x0a)
 #define GRN_SNIP                       (0x0b)
 #define GRN_PATSNIP                    (0x0c)
+#define GRN_STRING                     (0x0d)
 #define GRN_CURSOR_TABLE_HASH_KEY      (0x10)
 #define GRN_CURSOR_TABLE_PAT_KEY       (0x11)
 #define GRN_CURSOR_TABLE_DAT_KEY       (0x12)
@@ -1108,7 +1109,9 @@ typedef enum {
   GRN_OP_GET_REF,
   GRN_OP_GET_VALUE,
   GRN_OP_AND,
-  GRN_OP_BUT,
+  GRN_OP_AND_NOT,
+  /* Deprecated. Just for backward compatibility. */
+#define GRN_OP_BUT GRN_OP_AND_NOT
   GRN_OP_OR,
   GRN_OP_ASSIGN,
   GRN_OP_STAR_ASSIGN,
@@ -1698,7 +1701,7 @@ GRN_API grn_id grn_obj_id(grn_ctx *ctx, grn_obj *obj);
  * @obj: 検索対象のobject
  * @query: 検索クエリ
  * @res: 検索結果を格納するテーブル
- * @op: GRN_OP_OR, GRN_OP_AND, GRN_OP_BUT, GRN_OP_ADJUSTのいずれかを指定する
+ * @op: GRN_OP_OR, GRN_OP_AND, GRN_OP_AND_NOT, GRN_OP_ADJUSTのいずれかを指定する
  * @optarg: 詳細検索条件
  *
  * objを対象としてqueryにマッチするレコードを検索し、
@@ -1930,9 +1933,14 @@ GRN_API grn_posting *grn_geo_cursor_next(grn_ctx *ctx, grn_obj *cursor);
 #ifndef GRN_QUERY_AND
 #define GRN_QUERY_AND '+'
 #endif /* GRN_QUERY_AND */
-#ifndef GRN_QUERY_BUT
-#define GRN_QUERY_BUT '-'
-#endif /* GRN_QUERY_BUT */
+#ifndef GRN_QUERY_AND_NOT
+# ifdef GRN_QUERY_BUT
+   /* Deprecated. Just for backward compatibility. */
+#  define GRN_QUERY_AND_NOT GRN_QUERY_BUT
+# else
+#  define GRN_QUERY_AND_NOT '-'
+# endif /* GRN_QUERY_BUT */
+#endif /* GRN_QUERY_AND_NOT */
 #ifndef GRN_QUERY_ADJ_INC
 #define GRN_QUERY_ADJ_INC '>'
 #endif /* GRN_QUERY_ADJ_POS2 */
@@ -2015,8 +2023,15 @@ struct _grn_logger_info {
 
 GRN_API grn_rc grn_logger_info_set(grn_ctx *ctx, const grn_logger_info *info);
 
+#ifdef __GNUC__
+#define GRN_ATTRIBUTE_PRINTF(fmt_pos) \
+  __attribute__ ((format(printf, fmt_pos, fmt_pos + 1)))
+#else
+#define GRN_ATTRIBUTE_PRINTF(fmt_pos)
+#endif /* __GNUC__ */
+
 GRN_API void grn_logger_put(grn_ctx *ctx, grn_log_level level,
-                            const char *file, int line, const char *func, const char *fmt, ...);
+                            const char *file, int line, const char *func, const char *fmt, ...) GRN_ATTRIBUTE_PRINTF(6);
 
 GRN_API int grn_logger_pass(grn_ctx *ctx, grn_log_level level);
 
@@ -2024,6 +2039,9 @@ GRN_API int grn_logger_pass(grn_ctx *ctx, grn_log_level level);
 #define GRN_LOG_DEFAULT_LEVEL GRN_LOG_NOTICE
 #endif /* GRN_LOG_DEFAULT_LEVEL */
 
+GRN_API void grn_default_logger_set_max_level(grn_log_level level);
+GRN_API grn_log_level grn_default_logger_get_max_level();
+
 #define GRN_LOG(ctx,level,...) do {\
   if (grn_logger_pass(ctx, level)) {\
     grn_logger_put(ctx, (level), __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__); \
@@ -2135,6 +2153,13 @@ struct _grn_obj_format {
 
 GRN_API void grn_output_obj(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
                             grn_obj *obj, grn_obj_format *format);
+GRN_API void grn_output_envelope(grn_ctx *ctx, grn_rc rc,
+                                 grn_obj *head, grn_obj *body, grn_obj *foot,
+                                 const char *file, int line);
+GRN_API const char *grn_ctx_get_mime_type(grn_ctx *ctx);
+GRN_API void grn_ctx_recv_handler_set(grn_ctx *,
+                                      void (*func)(grn_ctx *, int, void *),
+                                      void *func_arg);
 
 /* obsolete */
 GRN_API grn_rc grn_text_otoj(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj,
@@ -2428,7 +2453,7 @@ GRN_API void grn_time_now(grn_ctx *ctx, grn_obj *obj);
   grn_bulk_write((ctx), (obj), (char *)&_val, sizeof(grn_obj *));\
 } while (0)
 
-/* grn_str */
+/* grn_str: deprecated. use grn_string instead. */
 
 typedef struct {
   const char *orig;
@@ -2451,6 +2476,56 @@ GRN_API grn_str *grn_str_open(grn_ctx *ctx, const char *str, unsigned int str_le
                               int flags);
 GRN_API grn_rc grn_str_close(grn_ctx *ctx, grn_str *nstr);
 
+/* grn_string */
+
+#define GRN_STRING_REMOVE_BLANK (0x01<<0)
+#define GRN_STRING_WITH_TYPES   (0x01<<1)
+#define GRN_STRING_WITH_CHECKS  (0x01<<2)
+
+#define GRN_NORMALIZER_AUTO ((grn_obj *)1)
+
+#define GRN_CHAR_BLANK 0x80
+#define GRN_CHAR_IS_BLANK(c) ((c) & (GRN_CHAR_BLANK))
+#define GRN_CHAR_TYPE(c) ((c) & 0x7f)
+
+typedef enum {
+  grn_char_null = 0,
+  grn_char_alpha,
+  grn_char_digit,
+  grn_char_symbol,
+  grn_char_hiragana,
+  grn_char_katakana,
+  grn_char_kanji,
+  grn_char_others
+} grn_char_type;
+
+GRN_API grn_obj *grn_string_open(grn_ctx *ctx,
+                                 const char *string,
+                                 unsigned int length_in_bytes,
+                                 grn_obj *normalizer, int flags);
+GRN_API grn_rc grn_string_get_original(grn_ctx *ctx, grn_obj *string,
+                                       const char **original,
+                                       unsigned int *length_in_bytes);
+GRN_API int grn_string_get_flags(grn_ctx *ctx, grn_obj *string);
+GRN_API grn_rc grn_string_get_normalized(grn_ctx *ctx, grn_obj *string,
+                                         const char **normalized,
+                                         unsigned int *length_in_bytes,
+                                         unsigned int *n_characters);
+GRN_API grn_rc grn_string_set_normalized(grn_ctx *ctx, grn_obj *string,
+                                         char *original,
+                                         unsigned int length_in_bytes,
+                                         unsigned int n_characters);
+GRN_API const short *grn_string_get_checks(grn_ctx *ctx, grn_obj *string);
+GRN_API grn_rc grn_string_set_checks(grn_ctx *ctx,
+                                     grn_obj *string,
+                                     short *checks);
+GRN_API const unsigned char *grn_string_get_types(grn_ctx *ctx, grn_obj *string);
+GRN_API grn_rc grn_string_set_types(grn_ctx *ctx,
+                                    grn_obj *string,
+                                    unsigned char *types);
+GRN_API grn_encoding grn_string_get_encoding(grn_ctx *ctx, grn_obj *string);
+
+
 GRN_API int grn_charlen(grn_ctx *ctx, const char *str, const char *end);
 
 /* expr */
@@ -2504,6 +2579,7 @@ typedef unsigned int grn_expr_flags;
 #define GRN_EXPR_ALLOW_PRAGMA          (0x02)
 #define GRN_EXPR_ALLOW_COLUMN          (0x04)
 #define GRN_EXPR_ALLOW_UPDATE          (0x08)
+#define GRN_EXPR_ALLOW_LEADING_NOT     (0x10)
 
 GRN_API grn_rc grn_expr_parse(grn_ctx *ctx, grn_obj *expr,
                               const char *str, unsigned int str_size,

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

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib -lws2_32 /home/kou/work/c/groonga.clean/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/kou/work/c/groonga.clean/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

@@ -0,0 +1,41 @@
+# table.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='table.dll'
+
+# Names of this library.
+library_names='table.dll.a'
+
+# The name of the static archive.
+old_library='table.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+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=''
+
+# Version information for table.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/table'

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

@@ -1,5 +1,5 @@
 # mecab.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmecab.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/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/kou/work/c/groonga.clean/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

@@ -1,5 +1,5 @@
 # libgroonga.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='libgroonga.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/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/kou/work/c/groonga.clean/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/kou/work/c/groonga.clean/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/libmsgpack.la

@@ -1,5 +1,5 @@
 # libmsgpack.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib'
+libdir='/home/khayashi/work/groonga/groonga.clean/packages/windows/dist-x86/lib'

data/vendor/local/lib/libmsgpackc.la

@@ -1,5 +1,5 @@
 # libmsgpackc.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kou/work/c/groonga.clean/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/kou/work/c/groonga.clean/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
@@ -8,10 +8,10 @@ datadir=${datarootdir}
 document_root=${datadir}/groonga/html/admin
 groonga=${bindir}/groonga.exe
 groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
-groonga_version=2.0.2
+groonga_version=2.0.5-316-g23cc017
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 2.0.2
+Version: 2.0.7
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

data/vendor/local/sbin/groonga-httpd-restart

@@ -0,0 +1,64 @@
+#!/bin/sh
+
+GROONGA_HTTPD=groonga-httpd
+PIDFILE=/var/run/groonga/${GROONGA_HTTPD}.pid
+OLD_PIDFILE=$PIDFILE.oldbin
+TIMEOUT=3
+
+# Source function library.
+if [ -f /lib/lsb/init-functions ]; then
+    . /lib/lsb/init-functions
+elif [ -f /etc/init.d/functions ]; then
+    . /etc/init.d/functions
+fi
+
+wait_until_file_is_created () {
+	timeout $TIMEOUT tail -F $1 --quiet 2> /dev/null | read 2> /dev/null
+}
+
+wait_until_process_is_finished () {
+	timeout $TIMEOUT tail -F /dev/null --pid=$1
+}
+
+if [ "$1" = "try-restart" ]; then
+	if [ ! -f "$PIDFILE" ]; then
+		exit 0
+	fi
+fi
+
+killproc -p $PIDFILE ${GROONGA_HTTPD} -USR2
+
+wait_until_file_is_created $OLD_PIDFILE
+if [ ! -f "$OLD_PIDFILE" ]; then
+	echo "Failed to start new groonga-httpd master."
+	exit 1
+fi
+
+OLD_PID=`cat $OLD_PIDFILE`
+
+# Switch worker process.
+kill -WINCH `cat $OLD_PIDFILE`
+
+wait_until_file_is_created $PIDFILE
+if [ ! -f "$PIDFILE" ]; then
+	echo "Failed to switch worker process."
+	exit 2
+fi
+PID=`cat $PIDFILE`
+
+OLD_WORKER_PROCESS=`pgrep -P $OLD_PID | grep -v $PID`
+for pid in $OLD_WORKER_PROCESS; do
+	wait_until_process_is_finished $pid
+done
+OLD_WORKER_PROCESS=`pgrep -P $OLD_PID | grep -v $PID`
+if [ -n "$OLD_WORKER_PROCESS" ]; then
+	echo "Failed to stop old groonga-httpd worker process."
+	killproc -p $PIDFILE ${GROONGA_HTTPD} -QUIT
+	echo "Rollback to old groonga-httpd master."
+	exit 2
+fi
+
+# Stop old master process.
+killproc -p $OLD_PIDFILE ${GROONGA_HTTPD} -QUIT
+exit $?
+

data/vendor/local/share/doc/groonga/en/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 1474d1b598d618ae9a7572a2b12ef5d9
+config: 8ca04e080dd5e4405a718c6fc5a1079e
 tags: fbb0d17656682115ca4d033fb2f83ba1

data/vendor/local/share/doc/groonga/en/html/_sources/community.txt

@@ -18,3 +18,20 @@ For English speakers
 
 For Japanese speakers
   `groonga-dev@lists.sourceforge.jp <http://lists.sourceforge.jp/mailman/listinfo/groonga-dev>`_
+
+Twitter
+-------
+
+`@groonga <https://twitter.com/groonga/>`_ tweets groonga related
+information.
+
+Please follow the account to get the latest groonga related
+information!
+
+Facebook
+--------
+
+`groonga page on Facebook <http://www.facebook.com/groonga>`_ shares
+groonga related information.
+
+Please like the page to get the latest groonga related information!