shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #3264: Fix --csv option

Browse Source
This commit is contained in:
Carlos Martín 2014-11-06 11:53:52 +01:00
parent eba387e3b1
commit 5fe28edcd5
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cli/oneacct
View File

@ -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']