From 80dc9e4990e3be53e1439162d516bebf39e2cd8d Mon Sep 17 00:00:00 2001 From: oetiker Date: Thu, 8 Nov 2007 10:16:27 +0000 Subject: [PATCH] fixed start end time in ruby fetch and added step size -- Mike Perham mperham gmail git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1213 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/NEWS | 4 ++++ program/bindings/ruby/main.c | 7 ++++--- program/doc/rrdruby.pod | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/program/NEWS b/program/NEWS index 6054e359..b1fa64b3 100644 --- a/program/NEWS +++ b/program/NEWS @@ -35,6 +35,10 @@ Forecasting (Evan Miller) method. It is a drop-in replacement for HWPREDICT, and is better suited for data whose seasonal variations grow or shrink in proportion to the average. +Misc +---- +* ruby rrd_fetch will return step as a last property -- Mike Perham + Incompatibility --------------- * If you create an RRD with the new MHWPREDICT function, the resulting rrdfile will diff --git a/program/bindings/ruby/main.c b/program/bindings/ruby/main.c index c5cf79ef..90f883bc 100644 --- a/program/bindings/ruby/main.c +++ b/program/bindings/ruby/main.c @@ -146,11 +146,12 @@ VALUE rb_rrd_fetch( } free(raw_data); - result = rb_ary_new2(4); - rb_ary_store(result, 0, INT2FIX(start)); - rb_ary_store(result, 1, INT2FIX(end)); + result = rb_ary_new2(5); + rb_ary_store(result, 0, INT2NUM(start)); + rb_ary_store(result, 1, INT2NUM(end)); rb_ary_store(result, 2, names); rb_ary_store(result, 3, data); + rb_ary_store(result, 4, INT2FIX(step)); return result; } diff --git a/program/doc/rrdruby.pod b/program/doc/rrdruby.pod index 96334471..5a647939 100644 --- a/program/doc/rrdruby.pod +++ b/program/doc/rrdruby.pod @@ -46,7 +46,7 @@ to the other B documentation for functions and valid arguments. puts puts "fetching data from #{rrd}" - (fstart, fend, data) = RRD.fetch(rrd, "--start", start.to_s, "--end", + (fstart, fend, data, step) = RRD.fetch(rrd, "--start", start.to_s, "--end", (start + 300 * 300).to_s, "AVERAGE") puts "got #{data.length} data points from #{fstart} to #{fend}" puts -- 2.30.2