Commit fe262214 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

basic report builder

parent c12d8854

doc/numtimeseries.json

+3 −3
Original line number Diff line number Diff line 
{

  "klass": "NumericTimeseriesReport",

  "klass": "ReportBuilder",

  "token": "gross_search_volume",

  "type": "NumericTimeseriesReport",

  "title": "Gross Search Volume",

  "since": 1336855399,

  "until": 1336901781,

  "query": "filter(_type & 'search_with_filter','search_without_filter')",

  "series": {

    "with_filter": {

lib/fnordquery.rb

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ require "fnordquery/acceptors/udp_acceptor" 
require "fnordquery/query"



require "fnordquery/report"

require "fnordquery/report_builder"

require "fnordquery/reports/numeric_timeseries_report"

require "fnordquery/reports/categorical_topk_report"
 
 No newline at end of file

lib/fnordquery/backends/redis_backend.rb

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ class FnordQuery::RedisBackend 
    end

    if query.since != :now

      q_until = query.until.is_a?(Symbol)? Time.now.to_i : query.until 

      puts "zrangebyscore #{@prefix} #{query.since} #{q_until}"

      @redis.zrangebyscore(@prefix, query.since, q_until) do |res|

        res.each do |raw|

          begin

lib/fnordquery/query.rb

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ private 
  end



  def parse_time(str)

    self.class.parse_time(str)

  end



  def self.parse_time(str)

    return :now     if str == "now"

    return str.to_i if str =~ /^[0-9]+$/

    return (Time.now.to_i - str[1..-1].to_i) if str =~ /^-[0-9]+$/

lib/fnordquery/report.rb

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ private 
  end



  def basedir

  	'./web/'

  	@opts[:basedir]

  end



end
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE