Commit 7e8ad15f authored by Paul Asmuth's avatar Paul Asmuth
Browse files

cleaning up

parent f0096fec
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
{
  "klass": "NumericTimeseriesReport",
  "title": "Gross Search Volume",
  "since": 1336873977,
  "until": 1336874946,
  "since": 1336805399,
  "until": 1336805399,
  "query": "filter(_type & 'search_with_filter','search_without_filter')",
  "series": {
    "with_filter": {
+2 −2
Original line number Diff line number Diff line
{
  "klass": "NumericTimeseriesReport",
  "title": "Search Filter Usage",
  "since": 1336873977,
  "until": 1336874946,
  "since": 1336855399,
  "until": 1336901781,
  "query": "filter(_type & 'search_with_filter','search_without_filter')",
  "series": {
    "price": {
+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ class FnordQuery::Query
      elsif filter[1] == :equals && filter[2].is_a?(String)
        event[filter[0]].to_s == filter[2]
      elsif filter[1] == :not_equals && filter[2].is_a?(String)
        puts "NOT EQUALS #{[event[filter[0]].to_s, filter[2]].inspect}"
        event[filter[0]].to_s != filter[2]
      elsif filter[1] == :list_include && filter[2].first.is_a?(String)
        filter[2].include?(event[filter[0]].to_s)
+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ class FnordQuery::NumericTimeseriesReport < FnordQuery::Report

      @series_queries.each do |skey, squery|
        if squery.matches?(event)
          puts event.inspect
  	      (event["_time"]-@tick..event["_time"]).to_a.reverse.detect do |t|
  	  	    if @series_timelines[skey].has_key?(t)
              @series_timelines[skey][t] += 1
@@ -57,7 +56,9 @@ private
  def render_result
    @series_render = @opts["series"].map do |skey, sopts|
      {
        :data  => @series_timelines[skey].map { |t,v| { :x => t, :y => v } },
        :data  => @series_timelines[skey].map { |t,v| 
          { :x => t, :y => v } 
        }.reverse,
        :name  => sopts["name"],
        :color => sopts["color"]
      }
+0 −9
Original line number Diff line number Diff line
@@ -31,12 +31,3 @@
    default_style: 'stack',
    series: #{@series_render.to_json}
  });

  function sampler(){
    var arr=[];
    var start = 1336873946;
    for(var n=0; n < 150; n++){
      arr.push({ x: (start + n), y: (23 + (Math.random()*5)) })
    }
    return arr;
  }
Loading