saved searches: fix to use new PostQuery class.
This commit is contained in:
@@ -174,6 +174,11 @@ class PostQuery
|
|||||||
build(AST.new(:and, [ast, *implicit_metatags]))
|
build(AST.new(:and, [ast, *implicit_metatags]))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Return a new PostQuery with terms sorted into alphabetical order.
|
||||||
|
def sort
|
||||||
|
build(ast.sort)
|
||||||
|
end
|
||||||
|
|
||||||
# Return a new PostQuery converted to conjunctive normal form.
|
# Return a new PostQuery converted to conjunctive normal form.
|
||||||
def to_cnf
|
def to_cnf
|
||||||
build(ast.to_cnf)
|
build(ast.to_cnf)
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ class SavedSearch < ApplicationRecord
|
|||||||
concerning :Queries do
|
concerning :Queries do
|
||||||
class_methods do
|
class_methods do
|
||||||
def normalize_query(query)
|
def normalize_query(query)
|
||||||
PostQueryBuilder.new(query.to_s).normalized_query(sort: false).to_s
|
PostQuery.new(query.to_s).replace_aliases.to_infix
|
||||||
end
|
end
|
||||||
|
|
||||||
def queries_for(user_id, label: nil)
|
def queries_for(user_id, label: nil)
|
||||||
@@ -166,7 +166,7 @@ class SavedSearch < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def normalized_query
|
def normalized_query
|
||||||
@normalized_query ||= PostQueryBuilder.new(query).normalized_query.to_s
|
@normalized_query ||= PostQuery.normalize(query).sort.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def rewrite_query(old_name, new_name)
|
def rewrite_query(old_name, new_name)
|
||||||
|
|||||||
Reference in New Issue
Block a user