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

refactored post search

Browse Source
This commit is contained in:
albert
2012-01-27 13:05:41 -05:00
parent 8b241138cd
commit 75d977ae80
6 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/logical/post_query_builder.rb
View File

@@ -1,8 +1,8 @@
class PostQueryBuilder
attr_accessor :q, :has_constraints
attr_accessor :query_string, :has_constraints
def initialize(q)
@q = q
def initialize(query_string)
@query_string = query_string
@has_constraint = false
end
@@ -54,20 +54,20 @@ class PostQueryBuilder
tag_query_sql = []
if tags[:include].any?
raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:include].size > Danbooru.config.tag_query_limit
raise ::Post::SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:include].size > Danbooru.config.tag_query_limit
tag_query_sql << "(" + escape_string_for_tsquery(tags[:include]).join(" | ") + ")"
has_constraints!
end
if tags[:related].any?
raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:related].size > Danbooru.config.tag_query_limit
raise ::Post::SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:related].size > Danbooru.config.tag_query_limit
tag_query_sql << "(" + escape_string_for_tsquery(tags[:related]).join(" & ") + ")"
has_constraints!
end
if tags[:exclude].any?
raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:exclude].size > Danbooru.config.tag_query_limit
raise SearchError.new("You cannot search for only excluded tags") unless has_constraints?
raise ::Post::SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:exclude].size > Danbooru.config.tag_query_limit
raise ::Post::SearchError.new("You cannot search for only excluded tags") unless has_constraints?
tag_query_sql << "!(" + escape_string_for_tsquery(tags[:exclude]).join(" | ") + ")"
end
@@ -101,8 +101,8 @@ class PostQueryBuilder
end
def build
unless q.is_a?(Hash)
q = Tag.parse_query(q)
unless query_string.is_a?(Hash)
q = Tag.parse_query(query_string)
end
relation = Post.scoped