Naoya Murakami
null+****@clear*****
Sat Jan 14 18:39:45 JST 2017
Naoya Murakami 2017-01-14 18:39:45 +0900 (Sat, 14 Jan 2017) New Revision: 142d5c36593ebc20c89bdddcf9caebe6e964488f https://github.com/groonga/groonga/commit/142d5c36593ebc20c89bdddcf9caebe6e964488f Merged b8c4ffd: Merge pull request #627 from naoa/dont-output-label-if-cant-sort Message: Don't output drilldown label if can't sort Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+2 -2) =================================================================== --- lib/proc/proc_select.c 2017-01-13 12:49:54 +0900 (a78dbde) +++ lib/proc/proc_select.c 2017-01-14 18:39:45 +0900 (0f558b3) @@ -2511,8 +2511,6 @@ grn_select_output_drilldowns(grn_ctx *ctx, target_table = result->table; } - data->output.formatter->drilldown_label(ctx, data, drilldown); - n_hits = grn_table_size(ctx, target_table); offset = drilldown->offset; @@ -2533,6 +2531,7 @@ grn_select_output_drilldowns(grn_ctx *ctx, if (sorted) { grn_table_sort(ctx, target_table, offset, limit, sorted, sort_keys, n_sort_keys); + data->output.formatter->drilldown_label(ctx, data, drilldown); if (!grn_proc_select_output_columns(ctx, sorted, n_hits, @@ -2548,6 +2547,7 @@ grn_select_output_drilldowns(grn_ctx *ctx, grn_table_sort_key_close(ctx, sort_keys, n_sort_keys); } } else { + data->output.formatter->drilldown_label(ctx, data, drilldown); if (!grn_proc_select_output_columns(ctx, target_table, n_hits, -------------- next part -------------- HTML����������������������������...Download