From 3d3cc4fa9faaf403d0cf9ab533df6377d1ef5002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 17 Jan 2013 17:37:02 +0100
Subject: [PATCH] Bug #1732: Fix -s & -e options for oneacct

---
 src/cli/one_helper/oneacct_helper.rb | 7 ++++---
 src/cli/oneacct                      | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb
index ffd08c048f..d390d6d8e0 100644
--- a/src/cli/one_helper/oneacct_helper.rb
+++ b/src/cli/one_helper/oneacct_helper.rb
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {
@@ -22,7 +23,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :short  => "-s TIME",
         :large  => "--start TIME" ,
         :description => "Start date and time to take into account",
-        :format => String # TODO Time
+        :format => Time
     }
 
     END_TIME = {
@@ -30,7 +31,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :short  => "-e TIME",
         :large  => "--end TIME" ,
         :description => "End date and time",
-        :format => String # TODO Time
+        :format => Time
     }
 
     USERFILTER = {
@@ -144,7 +145,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
     end
 
-    def self.print_start_enc_time_header(start_time, end_time)
+    def self.print_start_end_time_header(start_time, end_time)
         print "Showing active history records from "
 
         CLIHelper.scr_bold
diff --git a/src/cli/oneacct b/src/cli/oneacct
index 178a39db7e..90d8aa46f0 100755
--- a/src/cli/oneacct
+++ b/src/cli/oneacct
@@ -48,8 +48,8 @@ cmd = CommandParser::CmdParser.new(ARGV) do
 
     main do
         filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
-        start_time  = options[:start] ? options[:start].to_i : -1
-        end_time    = options[:end] ? options[:end].to_i : -1
+        start_time  = options[:start_time] ? options[:start_time].to_i : -1
+        end_time    = options[:end_time] ? options[:end_time].to_i : -1
 
         common_opts = {
             :start_time => start_time,