From 5fe28edcd504e48a6012c0e5a98de318a261a6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 6 Nov 2014 11:53:52 +0100 Subject: [PATCH] Feature #3264: Fix --csv option --- src/cli/oneacct | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/cli/oneacct b/src/cli/oneacct index fb0f4be52d..9b7b0754ca 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -184,8 +184,10 @@ cmd = CommandParser::CmdParser.new(ARGV) do else order_by = Hash.new - order_by[:order_by_1] = 'YEAR' - order_by[:order_by_2] = 'MONTH' + if !options[:csv] + order_by[:order_by_1] = 'YEAR' + order_by[:order_by_2] = 'MONTH' + end data_hash = pool.showback(filter_flag, common_opts.merge(order_by)) @@ -195,16 +197,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do end if options[:csv] - a = Array.new - data_hash.each do |user_id, value| - value['SHOWBACK_RECORDS']['SHOWBACK'].each do |l| - l['UID']=user_id - a << l - end - end - - cols = AcctHelper::SHOWBACK_TABLE.default_columns - AcctHelper::SHOWBACK_TABLE.default(:UID, *cols) + a = data_hash['SHOWBACK_RECORDS']['SHOWBACK'] AcctHelper::SHOWBACK_TABLE.show(a, options) exit(0) @@ -216,8 +209,6 @@ cmd = CommandParser::CmdParser.new(ARGV) do data_hash.each { |year, value| value.each { |month, showback_array| - - AcctHelper.print_month_header(year, month) array = showback_array['SHOWBACK_RECORDS']['SHOWBACK']