Browse Source

Fix result limit/offset mismatch

master
Dylan Baker 3 years ago
parent
commit
8d3e2a9c08
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      lib/search.rb

+ 6
- 4
lib/search.rb View File

1
 require 'sequel'
1
 require 'sequel'
2
 
2
 
3
+RESULTS_PER_PAGE = 50
4
+
3
 def search(params)
5
 def search(params)
4
   query = params[:q].strip
6
   query = params[:q].strip
5
-  offset = (params[:page] - 1) * 10
7
+  offset = (params[:page] - 1) * RESULTS_PER_PAGE
6
   username = params[:username].strip
8
   username = params[:username].strip
7
   from_date = params[:from_date].strip
9
   from_date = params[:from_date].strip
8
   to_date = params[:to_date].strip
10
   to_date = params[:to_date].strip
68
       AND (created_at >= ? OR ? IS NULL)
70
       AND (created_at >= ? OR ? IS NULL)
69
       AND (created_at <= ? OR ? IS NULL)
71
       AND (created_at <= ? OR ? IS NULL)
70
     ORDER BY #{sort}
72
     ORDER BY #{sort}
71
-    LIMIT 50
73
+    LIMIT #{RESULTS_PER_PAGE}
72
     OFFSET ?;
74
     OFFSET ?;
73
   SQL
75
   SQL
74
 end
76
 end
87
       AND ((LOWER(posts.creator) = LOWER(?)) OR (? = ''))
89
       AND ((LOWER(posts.creator) = LOWER(?)) OR (? = ''))
88
       AND (posts.created_at >= ? OR ? IS NULL)
90
       AND (posts.created_at >= ? OR ? IS NULL)
89
       AND (posts.created_at <= ? OR ? IS NULL)
91
       AND (posts.created_at <= ? OR ? IS NULL)
90
-    ORDER BY created_at DESC
91
-    LIMIT 50
92
+    ORDER BY posts.created_at DESC
93
+    LIMIT #{RESULTS_PER_PAGE}
92
     OFFSET ?;
94
     OFFSET ?;
93
   SQL
95
   SQL
94
 end
96
 end

Loading…
Cancel
Save