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

diff --git a/program/NEWS b/program/NEWS
index 6054e3593f08853674b7ee5b912362d551d70dd7..b1fa64b352d5193c411ef5251b3d274119431393 100644 (file)
--- 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 c5cf79effdfcb7569ea32812ff6e043b477baa27..90f883bc237ecdde64ac1d3c28fa4af695c907e6 100644 (file)
--- 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 963344711b9419d32497acb55ad351340bf4a567..5a647939ffb38d851fa9831ce314a7eaad96c899 100644 (file)
--- a/program/doc/rrdruby.pod
+++ b/program/doc/rrdruby.pod
@@ -46,7 +46,7 @@ to the other B<rrdtool> 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