IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: order:latest support for search

Browse Source
This commit is contained in:
Sam
2014-09-03 22:10:18 +10:00
parent 3a76dd3463
commit 28ae3c8ad0
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/search.rb
View File

@@ -149,6 +149,9 @@ class Search
elsif word == 'status:closed'
@status = :closed
nil
elsif word == 'order:latest'
@order = :latest
nil
else
word
end
@@ -274,15 +277,23 @@ class Search
end
posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC")
data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
if opts[:aggregate_search]
posts = posts.order("SUM(#{data_ranking}) DESC")
if @order == :latest
if opts[:aggregate_search]
posts = posts.order("MAX(posts.created_at) DESC")
else
posts = posts.order("posts.created_at DESC")
end
else
posts = posts.order("#{data_ranking} DESC")
posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC")
data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
if opts[:aggregate_search]
posts = posts.order("SUM(#{data_ranking}) DESC")
else
posts = posts.order("#{data_ranking} DESC")
end
posts = posts.order("topics.bumped_at DESC")
end
posts = posts.order("topics.bumped_at DESC")
if secure_category_ids.present?
posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted) OR (categories.id IN (?))", secure_category_ids).references(:categories)
@@ -331,7 +342,6 @@ class Search
.joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number")
.order('row_number')
posts.each do |post|
@results.add(post)
end