rrd.rb in focuslight-0.1.4

- old
+ new

@@ -328,11 +328,11 @@
       stack = (data.stack && i > 0 ? ':STACK' : '')
       file = (span =~ /^s/ ? path(data, :short) : path(data, :long))
 
       rrdoptions.push(
         'DEF:%s%dt=%s:%s:%s' % [gdata, i, file, gdata, cf],
-        'CDEF:%s%d=%s%dt,%s,%s,LIMIT,%d,%s' % [gdata, i, gdata, i, llimit, ulimit, data.dadjustval, data.adjust],
+        'CDEF:%s%d=%s%dt,%s,%s,LIMIT,%d,%s' % [gdata, i, gdata, i, llimit, ulimit, data.adjustval, data.adjust],
         'XPORT:%s%d:%s' % [gdata, i, _escape(data.graph)]
       )
       defs << ('%s%d' % [gdata, i])
     end
 
@@ -359,13 +359,13 @@
     column_names = cols_row[1..-1] # cols_row[0] == 'time'
     columns = column_names.length
     start_timestamp = ret.first.first
     end_timestamp = ret.last.first
     step = ret[1].first - ret[0].first
-
     rows = []
     ret.each do |values|
-      rows << values[1..-1]
+      # GrowthForecast compatibility NaN to nil
+      rows << values[1..-1].map {|v| v.nan? ? nil : v}
     end
 
     {
       'start_timestamp' => start_timestamp,
       'end_timestamp' => end_timestamp,