@@ -1,5 +1,3 @@ -include BotParser - class FilterController < ApplicationController protect_from_forgery :only => [:create, :update, :destroy] @@ -13,15 +11,27 @@ class FilterController < ApplicationController def data respond_to do |format| format.js do - conditions = Hash.new - params[:filter].each { |k, v| conditions[k] = v if (!(k == 'page_type' || v == '')) } - conditions['timepoint'] = params[:dfilter][:single] if params[:dfilter][:single].to_s != '' - #if params[:dfilter][:start].to_s != '' && params[:dfilter][:end].to_s != '' - # conditions << " AND timepoint BETWEEN '" + params[:dfilter][:start] + "' AND '" + params[:dfilter][:end] + " 23:59:59'" - #end + conditions = 'TRUE' + params[:filter].each { |k, v| conditions += " AND #{k} = '#{v}'" if (!(k == 'page_type' || v == '')) } + if params[:dfilter][:start] && params[:dfilter][:end] && params[:dfilter][:start].to_s != '' && params[:dfilter][:end].to_s != '' + conditions << " AND timepoint BETWEEN '" + params[:dfilter][:start] + "' AND '" + params[:dfilter][:end] + " 23:59:59'" + end data = retrieve_data(conditions) render :json => data.to_json, :layout => false end end end + def retrieve_data(conditions) + bots = Bot.find(:all) + shift = 100000000/bots.size + + filtered_day_hits = [] + dayhits = DayHit.find_by_sql "SELECT SUM(count) AS count, EXTRACT(epoch FROM date(timepoint))*1000+(bot_id-1)*#{shift} AS site_id, bot_id, timepoint FROM (SELECT timepoint, bot_id, count, response FROM day_hits WHERE #{conditions}) foo GROUP BY response, timepoint, bot_id" + dayhits.each { |dh| filtered_day_hits << { :timestamp => dh.site_id, :count => dh.count, :bot_id => dh.bot_id } } + + filtered_hits = [] + dayhits = DayHit.find_by_sql "SELECT * FROM (SELECT EXTRACT(epoch FROM date(dh.timepoint))*1000+(dh.bot_id-1)*#{shift} AS site_id, '<tr><td>' || dh.url || '</td><td>' || hi.timepoint || '</td><td>' || dh.response || '</td><td>' || hi.ip || '</td></tr>' AS url FROM hits hi JOIN (SELECT DISTINCT(id), url, bot_id, response, timepoint FROM day_hits WHERE #{conditions}) dh ON dh.id = hi.day_hit_id) foo GROUP BY site_id, url" + dayhits.each { |dh| filtered_hits << { :timestamp => dh.site_id, :html => dh.url } } + { :bots => bots, :hits => filtered_hits, :day_hits => filtered_day_hits } + end end app/controllers/filter_controller.rb @@ -5,8 +5,8 @@ <div id="pre_data"> <div id="filters"> - <p class="single"><label>Single Date:</label><input type="text" id="datepicker_single" /></p> - <p class="range"><label>Date Range:</label><input type="text" id="datepicker_start" /> to <input type="text" id="datepicker_end" /></p> + <p class="single"><img src="" alt="->" /><label>Single Date:</label><input type="text" id="datepicker_single" /></p> + <p class="range"><img src="" alt="->" /><label>Date Range:</label><input type="text" id="datepicker_start" /> to <input type="text" id="datepicker_end" /></p> <p><label>Bots:</label><%= collection_select(:filter, :bot_id, @bots, :id, :name, {:include_blank => true}) %></p> <p><label>Sites:</label><%= collection_select(:filter, :site, current_user.sites, :id, :name, {:include_blank => true}) %></p> <p><label>Responses:</label><%= collection_select(:filter, :response, @responses, :response, :response, {:include_blank => true}) %></p> app/views/filter/index.html.erb @@ -4,16 +4,10 @@ $(function() { var data, plot, previousPoint; var plot_data = []; -var blah = {}; -blah['l2'] = {}; -blah['l3'] = {}; -blah['l4'] = {}; -blah['l2'].shift = 50000000; -blah['l2'].lineWidth = 7; -blah['l3'].shift = 33333333; -blah['l3'].lineWidth = 5; -blah['l4'].shift = 25000000; -blah['l4'].lineWidth = 3; +var thickness = {}; +thickness['l2'] = 7; +thickness['l3'] = 5; +thickness['l4'] = 3; var showTooltip = function(x, y, contents) { $('<div id="tooltip">' + contents + '</div>').css( { @@ -28,30 +22,14 @@ var showTooltip = function(x, y, contents) { }).appendTo("body").fadeIn(200); }; -var process_data = function(site) { +var process_data = function() { var processed_data = {}; $.each(data.bots, function(id, p) { processed_data['bot' + p.bot.id] = new Array; }); var d = {}; $.each(data.day_hits, function(id, p) { - if(site == p.site_id || !site) { - if(d[p.key]) { - d[p.key].count += p.count; - } else { - d[p.key] = {}; - d[p.key].count = p.count; - d[p.key].timepoint = p.timepoint + (p.bot_id - 1) * blah['l' + data.bots.length].shift; - d[p.key].bot_id = p.bot_id; - d[p.key].site_id = p.site_id; - d[p.key].key = p.key; - d[p.key].url = p.url; - d[p.key].response = p.response; - } - } - }); - $.each(d, function(id, p) { - processed_data['bot' + p.bot_id].push([p.timepoint, p.count, p.bot_id, p.site_id, p.key, p.url, p.response]); + processed_data['bot' + p.bot_id].push([p.timestamp, p.count]); }); $.each(data.bots, function(id, p) { if(processed_data['bot' + p.bot.id].length > 0) { @@ -66,7 +44,7 @@ var plot_the_data = function() { plot = $.plot($('div#data'), plot_data, { points: { show: true, radius: 2, fillColor: null }, - bars: { show: true, lineWidth: blah['l' + data.bots.length].lineWidth }, + bars: { show: true, lineWidth: thickness['l' + data.bots.length] }, selection: { mode: "xy" }, grid: { hoverable: true, clickable: true }, xaxis: { mode: "time", timeformat: "%m/%d" }, @@ -86,14 +64,12 @@ var plot_the_data = function() { var clicked = function (event, pos, item) { if(item) { var html = '<table id="hit_data"><thead><tr><th>Url</th><th>Moment</th><th>Response</th><th>IP</th></tr></thead><tbody>'; - var point = plot_data[item.seriesIndex].data[item.dataIndex]; $.each(data.hits, function(id, h) { - if(h.key == point[4] && (h.site_id == point[3] || $('#filter_site').val() == '')) { - html += '<tr><td>' + h.value.replace(/;;/g, '</td><td>') + '</td></tr>'; + if(h.timestamp == item.datapoint[0]) { + html += h.html; } }); html += '</tbody></table>'; - plot_the_data(); $('div#shown_data').html(html); $('table#hit_data').tablesorter(); } public/javascripts/bot_parser.js @@ -19,7 +19,7 @@ var run_filter = function() { if($('#datepicker_single').attr('disabled')) { args += '&dfilter[start]=' + $('#datepicker_start').val() + '&dfilter[end]=' + $('#datepicker_end').val(); } else { - args += '&dfilter[single]=' + $('#datepicker_single').val(); + args += '&filter[timepoint]=' + $('#datepicker_single').val(); } $.ajax({ type: 'POST', @@ -29,7 +29,7 @@ var run_filter = function() { success: function(json) { plot_data = []; data = json; - process_data($('#filter_site').val()); + process_data(); plot_the_data(); }, error: function (XMLHttpRequest, textStatus, errorThrown) { public/javascripts/filter.js lib/bot_parser.rb a555518d0737fe2239d31bdbbcf269a875446585 Steph Powell steph@endpoint.com http://github.com/stephp/botpo/commit/925fae6d6d425e9cc68ff075699b05cc6433444b 925fae6d6d425e9cc68ff075699b05cc6433444b

2009-10-20T11:19:19-07:00

Cleanup. 73352932b1e44e7b275a9ba92ed4f17025423e05 Steph Powell steph@endpoint.com