Kouhei Sutou
null+****@clear*****
Wed Jul 30 11:39:23 JST 2014
Kouhei Sutou 2014-07-30 11:39:23 +0900 (Wed, 30 Jul 2014) New Revision: d108ef27b39384047b587240f49a55c4c3cbbb25 https://github.com/groonga/groonga/commit/d108ef27b39384047b587240f49a55c4c3cbbb25 Message: Use different block for readability Modified files: lib/output.c Modified: lib/output.c (+10 -9) =================================================================== --- lib/output.c 2014-07-30 11:38:14 +0900 (5f8f1ba) +++ lib/output.c 2014-07-30 11:39:23 +0900 (4ef5de2) @@ -1545,21 +1545,22 @@ transform_xml(grn_ctx *ctx, grn_obj *output, grn_obj *transformed) switch (place) { case XML_PLACE_HIT : if (result_set_n == 0) { - if (!in_vector) { + if (in_vector) { + if (vector_element_n > 0) { + GRN_TEXT_PUTS(ctx, transformed, ", "); + } + GRN_TEXT_PUT(ctx, transformed, + GRN_TEXT_VALUE(&buf), GRN_TEXT_LEN(&buf)); + vector_element_n++; + } else { char *c = transform_xml_next_column(&columns, column_n++); GRN_TEXT_PUTS(ctx, transformed, "<FIELD NAME=\""); GRN_TEXT_PUTS(ctx, transformed, c); GRN_TEXT_PUTS(ctx, transformed, "\">"); - } - if (in_vector && vector_element_n > 0) { - GRN_TEXT_PUTS(ctx, transformed, ", "); - } - GRN_TEXT_PUT(ctx, transformed, - GRN_TEXT_VALUE(&buf), GRN_TEXT_LEN(&buf)); - if (!in_vector) { + GRN_TEXT_PUT(ctx, transformed, + GRN_TEXT_VALUE(&buf), GRN_TEXT_LEN(&buf)); GRN_TEXT_PUTS(ctx, transformed, "</FIELD>\n"); } - vector_element_n++; } else { char *c = transform_xml_next_column(&columns, column_n++); GRN_TEXT_PUTS(ctx, transformed, c); -------------- next part -------------- HTML����������������������������...Download