Kouhei Sutou
null+****@clear*****
Sun Mar 6 18:10:09 JST 2016
Kouhei Sutou 2016-03-06 18:10:09 +0900 (Sun, 06 Mar 2016) New Revision: ab41c72f5f2eeb294156e9fa005cee0f1e7f9a3c https://github.com/groonga/groonga/commit/ab41c72f5f2eeb294156e9fa005cee0f1e7f9a3c Message: Reduce indent Modified files: lib/proc/proc_fuzzy_search.c lib/proc/proc_highlight.c lib/proc/proc_snippet.c Modified: lib/proc/proc_fuzzy_search.c (+38 -38) =================================================================== --- lib/proc/proc_fuzzy_search.c 2016-03-06 18:01:15 +0900 (4e8d99f) +++ lib/proc/proc_fuzzy_search.c 2016-03-06 18:10:09 +0900 (7d2ab40) @@ -296,7 +296,6 @@ selector_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *index, grn_obj *target = NULL; grn_obj *obj; grn_obj *query; - grn_obj *option_ptr; uint32_t max_distance = 1; uint32_t prefix_length = 0; uint32_t prefix_match_size = 0; @@ -315,51 +314,52 @@ selector_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *index, query = args[2]; if (nargs == 4) { + grn_obj *options = args[3]; grn_hash_cursor *cursor; void *key; grn_obj *value; int key_size; - option_ptr = args[3]; - if (option_ptr->header.type == GRN_TABLE_HASH_KEY) { - grn_obj *option = option_ptr; - if (option->header.type != GRN_TABLE_HASH_KEY) { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "fuzzy_search(): " - "3rd argument must be object literal: <%.*s>", - (int)GRN_TEXT_LEN(args[3]), GRN_TEXT_VALUE(args[3])); - goto exit; - } - cursor = grn_hash_cursor_open(ctx, (grn_hash *)option, - NULL, 0, NULL, 0, - 0, -1, 0); - if (!cursor) { - GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, - "fuzzy_search(): couldn't open cursor"); - goto exit; - } - while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { - grn_hash_cursor_get_key_value(ctx, cursor, &key, &key_size, (void **)&value); - - if (key_size == 12 && !memcmp(key, "max_distance", 12)) { - max_distance = GRN_UINT32_VALUE(value); - } else if (key_size == 13 && !memcmp(key, "prefix_length", 13)) { - prefix_length = GRN_UINT32_VALUE(value); - } else if (key_size == 13 && !memcmp(key, "max_expansion", 13)) { - max_expansion = GRN_UINT32_VALUE(value); - } else if (key_size == 18 && !memcmp(key, "with_transposition", 18)) { - if (GRN_BOOL_VALUE(value)) { - flags |= GRN_TABLE_FUZZY_SEARCH_WITH_TRANSPOSITION; - } - } else { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, "invalid option name: <%.*s>", - key_size, (char *)key); - grn_hash_cursor_close(ctx, cursor); - goto exit; + if (options->header.type != GRN_TABLE_HASH_KEY) { + GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, + "fuzzy_search(): " + "3rd argument must be object literal: <%.*s>", + (int)GRN_TEXT_LEN(options), + GRN_TEXT_VALUE(options)); + goto exit; + } + + cursor = grn_hash_cursor_open(ctx, (grn_hash *)options, + NULL, 0, NULL, 0, + 0, -1, 0); + if (!cursor) { + GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, + "fuzzy_search(): couldn't open cursor"); + goto exit; + } + while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { + grn_hash_cursor_get_key_value(ctx, cursor, &key, &key_size, + (void **)&value); + + if (key_size == 12 && !memcmp(key, "max_distance", 12)) { + max_distance = GRN_UINT32_VALUE(value); + } else if (key_size == 13 && !memcmp(key, "prefix_length", 13)) { + prefix_length = GRN_UINT32_VALUE(value); + } else if (key_size == 13 && !memcmp(key, "max_expansion", 13)) { + max_expansion = GRN_UINT32_VALUE(value); + } else if (key_size == 18 && !memcmp(key, "with_transposition", 18)) { + if (GRN_BOOL_VALUE(value)) { + flags |= GRN_TABLE_FUZZY_SEARCH_WITH_TRANSPOSITION; } + } else { + GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, + "invalid option name: <%.*s>", + key_size, (char *)key); + grn_hash_cursor_close(ctx, cursor); + goto exit; } - grn_hash_cursor_close(ctx, cursor); } + grn_hash_cursor_close(ctx, cursor); } if (index) { Modified: lib/proc/proc_highlight.c (+36 -45) =================================================================== --- lib/proc/proc_highlight.c 2016-03-06 18:01:15 +0900 (ebf50b5) +++ lib/proc/proc_highlight.c 2016-03-06 18:10:09 +0900 (589b729) @@ -256,54 +256,45 @@ func_highlight(grn_ctx *ctx, int nargs, grn_obj **args, int n_args_without_option = nargs; if (end_arg->header.type == GRN_TABLE_HASH_KEY) { - grn_obj *hash = end_arg; - if (hash) { - grn_hash_cursor *cursor; - void *key; - grn_obj *value; - int key_size; - if (hash->header.type != GRN_TABLE_HASH_KEY) { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "highlight(): " - "end argument must be object literal: <%.*s>", - (int)GRN_TEXT_LEN(end_arg), - GRN_TEXT_VALUE(end_arg)); - goto exit; - } - n_args_without_option--; - - cursor = grn_hash_cursor_open(ctx, (grn_hash *)hash, - NULL, 0, NULL, 0, - 0, -1, 0); - if (!cursor) { - GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, - "highlight(): couldn't open cursor"); - goto exit; - } - while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { - grn_hash_cursor_get_key_value(ctx, cursor, &key, &key_size, (void **)&value); - if (key_size == 10 && !memcmp(key, "normalizer", 10)) { - normalizer_name = GRN_TEXT_VALUE(value); - normalizer_name_length = GRN_TEXT_LEN(value); - } else if (key_size == 11 && !memcmp(key, "html_escape", 11)) { - if (GRN_BOOL_VALUE(value)) { - use_html_escape = GRN_TRUE; - } - } else if (key_size == 16 && !memcmp(key, "default_open_tag", 16)) { - default_open_tag = GRN_TEXT_VALUE(value); - default_open_tag_length = GRN_TEXT_LEN(value); - } else if (key_size == 17 && !memcmp(key, "default_close_tag", 17)) { - default_close_tag = GRN_TEXT_VALUE(value); - default_close_tag_length = GRN_TEXT_LEN(value); - } else { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, "invalid option name: <%.*s>", - key_size, (char *)key); - grn_hash_cursor_close(ctx, cursor); - goto exit; + grn_obj *options = end_arg; + grn_hash_cursor *cursor; + void *key; + grn_obj *value; + int key_size; + + n_args_without_option--; + cursor = grn_hash_cursor_open(ctx, (grn_hash *)options, + NULL, 0, NULL, 0, + 0, -1, 0); + if (!cursor) { + GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, + "highlight(): couldn't open cursor"); + goto exit; + } + while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { + grn_hash_cursor_get_key_value(ctx, cursor, &key, &key_size, + (void **)&value); + if (key_size == 10 && !memcmp(key, "normalizer", 10)) { + normalizer_name = GRN_TEXT_VALUE(value); + normalizer_name_length = GRN_TEXT_LEN(value); + } else if (key_size == 11 && !memcmp(key, "html_escape", 11)) { + if (GRN_BOOL_VALUE(value)) { + use_html_escape = GRN_TRUE; } + } else if (key_size == 16 && !memcmp(key, "default_open_tag", 16)) { + default_open_tag = GRN_TEXT_VALUE(value); + default_open_tag_length = GRN_TEXT_LEN(value); + } else if (key_size == 17 && !memcmp(key, "default_close_tag", 17)) { + default_close_tag = GRN_TEXT_VALUE(value); + default_close_tag_length = GRN_TEXT_LEN(value); + } else { + GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, "invalid option name: <%.*s>", + key_size, (char *)key); + grn_hash_cursor_close(ctx, cursor); + goto exit; } - grn_hash_cursor_close(ctx, cursor); } + grn_hash_cursor_close(ctx, cursor); } keywords = Modified: lib/proc/proc_snippet.c (+51 -61) =================================================================== --- lib/proc/proc_snippet.c 2016-03-06 18:01:15 +0900 (54d2033) +++ lib/proc/proc_snippet.c 2016-03-06 18:10:09 +0900 (b968e54) @@ -105,71 +105,61 @@ func_snippet(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) int n_args_without_option = nargs; if (end_arg->header.type == GRN_TABLE_HASH_KEY) { - grn_obj *hash = end_arg; - if (hash) { - grn_hash_cursor *cursor; - void *key; - int key_size; - grn_obj *value; - if (hash->header.type != GRN_TABLE_HASH_KEY) { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "snippet(): " - "end argument must be object literal: <%.*s>", - (int)GRN_TEXT_LEN(args[nargs - 1]), - GRN_TEXT_VALUE(args[nargs - 1])); - goto exit; - } - n_args_without_option--; + grn_obj *options = end_arg; + grn_hash_cursor *cursor; + void *key; + int key_size; + grn_obj *value; - cursor = grn_hash_cursor_open(ctx, (grn_hash *)hash, - NULL, 0, NULL, 0, - 0, -1, 0); - if (!cursor) { - GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, - "snippet(): couldn't open cursor"); - goto exit; - } - while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { - grn_hash_cursor_get_key_value(ctx, cursor, - &key, &key_size, - (void **)&value); - if (key_size == 5 && !memcmp(key, "width", 5)) { - width = GRN_UINT32_VALUE(value); - } else if (key_size == 13 && !memcmp(key, "max_n_results", 13)) { - max_n_results = GRN_UINT32_VALUE(value); - } else if (key_size == 19 && !memcmp(key, "skip_leading_spaces", 19)) { - if (GRN_BOOL_VALUE(value) == GRN_FALSE) { - flags &= ~GRN_SNIP_SKIP_LEADING_SPACES; - } - } else if (key_size == 11 && !memcmp(key, "html_escape", 11)) { - if (GRN_BOOL_VALUE(value)) { - mapping = GRN_SNIP_MAPPING_HTML_ESCAPE; - } - } else if (key_size == 6 && !memcmp(key, "prefix", 6)) { - prefix = GRN_TEXT_VALUE(value); - prefix_length = GRN_TEXT_LEN(value); - } else if (key_size == 6 && !memcmp(key, "suffix", 6)) { - suffix = GRN_TEXT_VALUE(value); - suffix_length = GRN_TEXT_LEN(value); - } else if (key_size == 10 && !memcmp(key, "normalizer", 10)) { - normalizer_name = GRN_TEXT_VALUE(value); - normalizer_name_length = GRN_TEXT_LEN(value); - } else if (key_size == 16 && !memcmp(key, "default_open_tag", 16)) { - default_open_tag = GRN_TEXT_VALUE(value); - default_open_tag_length = GRN_TEXT_LEN(value); - } else if (key_size == 17 && !memcmp(key, "default_close_tag", 17)) { - default_close_tag = GRN_TEXT_VALUE(value); - default_close_tag_length = GRN_TEXT_LEN(value); - } else { - GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, - "invalid option name: <%.*s>", - key_size, (char *)key); - grn_hash_cursor_close(ctx, cursor); - goto exit; + n_args_without_option--; + cursor = grn_hash_cursor_open(ctx, (grn_hash *)options, + NULL, 0, NULL, 0, + 0, -1, 0); + if (!cursor) { + GRN_PLUGIN_ERROR(ctx, GRN_NO_MEMORY_AVAILABLE, + "snippet(): couldn't open cursor"); + goto exit; + } + while (grn_hash_cursor_next(ctx, cursor) != GRN_ID_NIL) { + grn_hash_cursor_get_key_value(ctx, cursor, + &key, &key_size, + (void **)&value); + if (key_size == 5 && !memcmp(key, "width", 5)) { + width = GRN_UINT32_VALUE(value); + } else if (key_size == 13 && !memcmp(key, "max_n_results", 13)) { + max_n_results = GRN_UINT32_VALUE(value); + } else if (key_size == 19 && !memcmp(key, "skip_leading_spaces", 19)) { + if (GRN_BOOL_VALUE(value) == GRN_FALSE) { + flags &= ~GRN_SNIP_SKIP_LEADING_SPACES; + } + } else if (key_size == 11 && !memcmp(key, "html_escape", 11)) { + if (GRN_BOOL_VALUE(value)) { + mapping = GRN_SNIP_MAPPING_HTML_ESCAPE; } + } else if (key_size == 6 && !memcmp(key, "prefix", 6)) { + prefix = GRN_TEXT_VALUE(value); + prefix_length = GRN_TEXT_LEN(value); + } else if (key_size == 6 && !memcmp(key, "suffix", 6)) { + suffix = GRN_TEXT_VALUE(value); + suffix_length = GRN_TEXT_LEN(value); + } else if (key_size == 10 && !memcmp(key, "normalizer", 10)) { + normalizer_name = GRN_TEXT_VALUE(value); + normalizer_name_length = GRN_TEXT_LEN(value); + } else if (key_size == 16 && !memcmp(key, "default_open_tag", 16)) { + default_open_tag = GRN_TEXT_VALUE(value); + default_open_tag_length = GRN_TEXT_LEN(value); + } else if (key_size == 17 && !memcmp(key, "default_close_tag", 17)) { + default_close_tag = GRN_TEXT_VALUE(value); + default_close_tag_length = GRN_TEXT_LEN(value); + } else { + GRN_PLUGIN_ERROR(ctx, GRN_INVALID_ARGUMENT, + "invalid option name: <%.*s>", + key_size, (char *)key); + grn_hash_cursor_close(ctx, cursor); + goto exit; } - grn_hash_cursor_close(ctx, cursor); } + grn_hash_cursor_close(ctx, cursor); } snip = grn_snip_open(ctx, flags, width, max_n_results, -------------- next part -------------- HTML����������������������������...下载
