public/images/next.png @@ -3,17 +3,17 @@ class FilterController < ApplicationController def index @bots = Bot.find(:all) - @responses = DayHit.find(:all, :select => 'DISTINCT response') - @urls = DayHit.find(:all, :select => 'DISTINCT url') - @page_types = PageType.find(:all) + @responses = [200, 301, 302, 304, 400, 404, 409, 500, 502, 503] + #@urls = DayHit.find_by_sql "SELECT DISTINCT url FROM day_hits LIMIT 10" + #@page_types = PageType.find(:all) end def data respond_to do |format| format.js do 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 != '' + params[:filter].each { |k, v| conditions += " AND #{k} = '#{v}'" if (!(k == 'page_type' || v == '' || v == 'undefined')) } + if params[:dfilter] && 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) @@ -26,12 +26,18 @@ class FilterController < ApplicationController 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 } } + max = 0 + 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 FROM day_hits WHERE #{conditions}) foo GROUP BY timepoint, bot_id" + dayhits.each do |dh| + filtered_day_hits << { :timestamp => dh.site_id, :count => dh.count, :bot_id => dh.bot_id } + max = dh.count if dh.count > max + end 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 } } + if max < 1000 + 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 } } + end { :bots => bots, :hits => filtered_hits, :day_hits => filtered_day_hits } end end app/controllers/filter_controller.rb @@ -5,16 +5,27 @@ <div id="pre_data"> <div id="filters"> - <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 class="all"><img src="/images/next.png" alt="->" /><label>All Dates</label></p> + <p class="single"><img src="/images/next.png" alt="->" /><label>Single Date:</label><input type="text" id="datepicker_single" /></p> + <p class="range"><img src="/images/next.png" 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> + <p><label>Sites:</label><%= collection_select(:filter, :site, current_user.sites, :id, :name, {:include_blank => false}) %></p> + <p><label>Responses:</label> + <select id="filter_response" name="filter[response]"> + <option value="">All</option> + <% @responses.each do |r| -%><option value="<%= r.to_s %>"><%= r.to_s %></option><% end -%> + </select> + </p> + <% if @urls -%> <p><label>URLS:</label><%= collection_select(:filter, :url, @urls, :url, :url, {:include_blank => true}) %></p> -  + <% end -%> + <% if @page_types -%> + <p><label>Page Types:</label><input id="filter_page_type" value="" /></p> + <% end -%> <a href="#" class="run_filter">Run</a> </div> </div> +<div id="legend"></div> <div id="data"></div> <div id="shown_data"></div> app/views/filter/index.html.erb @@ -11,58 +11,13 @@ RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - # See Rails::Configuration for more options. - - # Skip frameworks you're not going to use. To use Rails without a database - # you must remove the Active Record framework. - # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - - # Specify gems that this application depends on. - # They can then be installed with "rake gems:install" on new installations. + config.log_level = :error config.gem 'resource_controller' config.gem 'paperclip' - - # Only load the plugins named here, in the order given. By default, all plugins - # in vendor/plugins are loaded in alphabetical order. - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) - - # Force all environments to use the same logger level - # (by default production uses :info, the others :debug) - #config.log_level = :error - - # Make Time.zone default to the specified zone, and make Active Record store time values - # in the database in UTC, and return them converted to the specified local zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time. config.time_zone = 'UTC' - - # Your secret key for verifying cookie session data integrity. - # If you change this key, all old sessions will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. config.action_controller.session = { :session_key => '_botpo_session', :secret => 'a5c350273c7c06fbefe00db45de1fd5967f8c2260e9cdf7814f819f58d61df966a1293300ff57aa15eff22b3acd8b77d8c86130a364d74d6907c2991994321aa' } - - # Use the database for sessions instead of the cookie-based default, - # which shouldn't be used to store highly confidential information - # (create the session table with "rake db:sessions:create") - # config.action_controller.session_store = :active_record_store - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector - config.active_record.observers = :user_observer end config/environment.rb @@ -4,10 +4,6 @@ $(function() { var data, plot, previousPoint; var plot_data = []; -var thickness = {}; -thickness['l2'] = 7; -thickness['l3'] = 5; -thickness['l4'] = 3; var showTooltip = function(x, y, contents) { $('<div id="tooltip">' + contents + '</div>').css( { @@ -23,11 +19,11 @@ var showTooltip = function(x, y, contents) { }; var process_data = function() { + //STEPH TODO cleanup to optimize 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) { processed_data['bot' + p.bot_id].push([p.timestamp, p.count]); }); @@ -40,21 +36,29 @@ var process_data = function() { }; var plot_the_data = function() { + plot_data = []; + process_data(); $('div#data').unbind('plothover').unbind('plotclick').css('height', '400px'); plot = $.plot($('div#data'), plot_data, { points: { show: true, radius: 2, fillColor: null }, - bars: { show: true, lineWidth: thickness['l' + data.bots.length] }, + bars: { show: true, lineWidth: 2 }, selection: { mode: "xy" }, grid: { hoverable: true, clickable: true }, - xaxis: { mode: "time", timeformat: "%m/%d" }, - yaxis: { min: 0, ticks: 10 }, + xaxis: { mode: "time", timeformat: "%m/%d", autoscaleMargin: 0.05 }, + yaxis: { min: 0, ticks: 10, autoscaleMargin: 0.1 }, + legend: { container: $('div#legend') }, shadowSize: 0 }); if(plot_data.length > 0) { - $('div#data') - .bind('plothover', function(event, pos, item) { hover(event, pos, item) }) - .bind('plotclick', function(event, pos, item) { clicked(event, pos, item) }); + if(data.hits.length > 0) { + $('div#data') + .bind('plothover', function(event, pos, item) { hover(event, pos, item) }) + .bind('plotclick', function(event, pos, item) { clicked(event, pos, item) }); + $('div#legend').append($(document.createElement('p')).html('Data is clickable')); + } else { + $('div#data').bind('plothover', function(event, pos, item) { hover(event, pos, item) }); + } } else { $('div#data').html('there is no data.'); } public/javascripts/bot_parser.js @@ -7,18 +7,22 @@ $(function() { $('p.range img').click(function() { $('p.single input').attr('disabled', true); $('p.range input').removeAttr('disabled'); }); + $('p.all img').click(function() { + $('p.range input').attr('disabled', true); + $('p.single input').attr('disabled', true); + }); $('a.run_filter').click(function() { $('div#data').html('<img src="/images/ajax_loader.gif" />'); run_filter(); }); }); var run_filter = function() { var args = 'filter[bot_id]=' + $('#filter_bot_id').val() + '&filter[response]=' + $('#filter_response').val() + - '&filter[url]=' + $('#filter_url').val() + - '&filter[page_type]=' + $('#filter_page_type').val() + + //'&filter[url]=' + $('#filter_url').val() + + //'&filter[page_type]=' + $('#filter_page_type').val() + '&filter[site_id]=' + $('#filter_site').val(); - if($('#datepicker_single').attr('disabled')) { + if(!$('#datepicker_start').attr('disabled')) { args += '&dfilter[start]=' + $('#datepicker_start').val() + '&dfilter[end]=' + $('#datepicker_end').val(); - } else { + } else if(!$('#datepicker_single').attr('disabled')) { args += '&filter[timepoint]=' + $('#datepicker_single').val(); } $.ajax({ @@ -27,13 +31,11 @@ var run_filter = function() { dataType: 'json', data: args, success: function(json) { - plot_data = []; data = json; - process_data(); plot_the_data(); }, error: function (XMLHttpRequest, textStatus, errorThrown) { - alert('error'); + alert('fail'); } }); }; public/javascripts/filter.js @@ -7,7 +7,9 @@ h2 { font-size: 14px; } p { font-size: 12px; } div#filters { background-color: #b5bd9a; font-size: 11px; padding: 10px; } - div#filters img { float: left; } + div#filters img { float: left; position: relative; top: 4px; margin-right: 2px; } + div#filters p { height: 20px; } + div#filters img:hover { cursor: pointer; } div#filters input { font-size: 11px; } div#filters p { margin: 2px 0px; padding: 0px; clear: both; } div#filters p label { float: left; width: 100px; position: relative; top: 4px; } @@ -17,7 +19,8 @@ div#ui-datepicker-div { background-color: #FFF; z-index: 30; font-size: 11px; } div#ui-datepicker-div a { text-decoration: none; } div#pre_data { margin-left: 10px; padding: 10px 0; position: relative; } -div#data { width: 868px; margin: 0px auto; } +div#legend { display: inline; } +div#data { width: 800px; margin: 0px auto; } div#shown_data { margin: 10px 0px; } div.clear { clear: both; } public/stylesheets/bot_parser.css 8fe51a7e15d6d0783a94ae4c98a6c7fbabed4680 Steph Powell steph@endpoint.com http://github.com/stephp/botpo/commit/9ce06b474d0390f67c228e59d89dd65d324efc54 9ce06b474d0390f67c228e59d89dd65d324efc54

2009-10-20T13:28:04-07:00

Scalability work for client use. 06524f8a9334248d5c81f4269edd8c201034538d Steph Powell steph@endpoint.com