Yoji Shidara
null+****@clear*****
Thu Jan 23 12:22:17 JST 2014
Yoji Shidara 2014-01-23 12:22:17 +0900 (Thu, 23 Jan 2014) New Revision: 8501762b7c504e6f047bbebd0f7d4c146b26f223 https://github.com/droonga/fluent-plugin-droonga/commit/8501762b7c504e6f047bbebd0f7d4c146b26f223 Merged 1ab6677: Merge branch 'output-attributes' Message: Use common logic to format a record Modified files: lib/droonga/searcher.rb Modified: lib/droonga/searcher.rb (+3 -10) =================================================================== --- lib/droonga/searcher.rb 2014-01-23 11:31:02 +0900 (8f9f83d) +++ lib/droonga/searcher.rb 2014-01-23 12:22:17 +0900 (aa1a374) @@ -432,16 +432,9 @@ module Droonga module RecordsFormattable def record_value(record, attribute) if attribute[:source] == "_subrecs" - if****@reque*****_output? - record.sub_records.collect do |sub_record| - target_attributes = resolve_attributes(attribute, sub_record) - complex_record(target_attributes, sub_record) - end - else - record.sub_records.collect do |sub_record| - target_attributes = resolve_attributes(attribute, sub_record) - simple_record(target_attributes, sub_record) - end + record.sub_records.collect do |sub_record| + sub_attributes = attribute[:attributes] + format_record(sub_attributes, sub_record) end else expression = attribute[:expression] -------------- next part -------------- HTML����������������������������...Download