jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for blank tag counts

Browse Source
This commit is contained in:
albert
2013-02-20 16:05:03 -05:00
parent 46e915354d
commit b5064d197c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/post.rb
View File

@@ -595,11 +595,16 @@ class Post < ActiveRecord::Base
def fast_count(tags = "") def fast_count(tags = "")
tags = tags.to_s.strip tags = tags.to_s.strip
if tags.blank? && Danbooru.config.blank_tag_search_fast_count
count = Danbooru.config.blank_tag_search_fast_count
else
count = get_count_from_cache(tags) count = get_count_from_cache(tags)
if count.nil? if count.nil?
fast_count_search(tags) fast_count_search(tags)
end end
end
count.to_i count.to_i
rescue SearchError rescue SearchError
@@ -607,13 +612,9 @@ class Post < ActiveRecord::Base
end end
def fast_count_search(tags) def fast_count_search(tags)
if tags.blank? && Danbooru.config.blank_tag_search_fast_count
count = Danbooru.config.blank_tag_search_fast_count
else
count = Post.with_timeout(500, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do count = Post.with_timeout(500, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do
Post.tag_match(tags).undeleted.count Post.tag_match(tags).undeleted.count
end end
end
if count == 0 if count == 0
count = Post.tag_match(tags).undeleted.count count = Post.tag_match(tags).undeleted.count

1
lib/danbooru/paginator/active_record_extension.rb
View File

@@ -70,6 +70,7 @@ module Danbooru
# taken from kaminari (https://github.com/amatsuda/kaminari) # taken from kaminari (https://github.com/amatsuda/kaminari)
def total_count def total_count
raise if @paginator_options[:count] == 0
return @paginator_options[:count] if @paginator_options[:count] return @paginator_options[:count] if @paginator_options[:count]
c = except(:offset, :limit, :order) c = except(:offset, :limit, :order)