github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99 from wiibaa/master

Browse source 
Logstash web page navigation issue on last page
This commit is contained in:
Jordan Sissel 2012-06-08 11:13:58 -07:00
commit 107f4c49d6
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/logstash/web/controllers/api_v1.rb
View file

@ -12,6 +12,10 @@ class LogStash::Web::Server < Sinatra::Base
offset = params["offset"] = (params["offset"] or 0).to_i
format = (params[:format] or "json")
if count == 0
count = params["count"] = 50
end
query = LogStash::Search::Query.new(
:query_string => params[:q],
:offset => offset,
@ -44,7 +48,6 @@ class LogStash::Web::Server < Sinatra::Base
@events = @results.events
@total = (@results.total rescue 0)
count = @results.events.size
if count and offset
if @total > (count + offset)
@ -57,10 +60,10 @@ class LogStash::Web::Server < Sinatra::Base
if count + offset < @total
next_params = params.clone
next_params["offset"] = [offset + count, @total - count].min
next_params["offset"] = [offset + count, @total/count * count].min
@next_href = "?" + next_params.collect { |k,v| [URI.escape(k.to_s), URI.escape(v.to_s)].join("=") }.join("&")
last_params = next_params.clone
last_params["offset"] = @total - count
last_params["offset"] = @total/count * count
@last_href = "?" + last_params.collect { |k,v| [URI.escape(k.to_s), URI.escape(v.to_s)].join("=") }.join("&")
end