Naoya Murakami
null+****@clear*****
Sat Jan 14 19:06:09 JST 2017
Naoya Murakami 2017-01-14 19:06:09 +0900 (Sat, 14 Jan 2017) New Revision: bbab7333b68259f4d03a53136080a8adce615dfc https://github.com/groonga/groonga/commit/bbab7333b68259f4d03a53136080a8adce615dfc Merged b8c4ffd: Merge pull request #627 from naoa/dont-output-label-if-cant-sort Message: Don't output slice 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-14 18:39:45 +0900 (0f558b3) +++ lib/proc/proc_select.c 2017-01-14 19:06:09 +0900 (23d3602) @@ -1926,8 +1926,6 @@ grn_select_output_slices(grn_ctx *ctx, continue; } - data->output.formatter->slice_label(ctx, data, slice); - n_hits = grn_table_size(ctx, slice->table); offset = slice->offset; @@ -1948,6 +1946,7 @@ grn_select_output_slices(grn_ctx *ctx, if (sorted) { grn_table_sort(ctx, slice->table, offset, limit, sorted, sort_keys, n_sort_keys); + data->output.formatter->slice_label(ctx, data, slice); if (!grn_proc_select_output_columns(ctx, sorted, n_hits, @@ -1963,6 +1962,7 @@ grn_select_output_slices(grn_ctx *ctx, grn_table_sort_key_close(ctx, sort_keys, n_sort_keys); } } else { + data->output.formatter->slice_label(ctx, data, slice); if (!grn_proc_select_output_columns(ctx, slice->table, n_hits, -------------- next part -------------- HTML����������������������������...Descargar
