Fix pagination

lib/search.rb

@@ -11,7 +11,7 @@ def search(params)
   username = params[:username].strip
   from_date = params[:from_date].strip
   to_date = params[:to_date].strip
-  sort = params[:sort].strip
+  sort = (params[:sort] || "").strip
   exact_match = params[:exact_match].strip == "yes"
 
   errors = Array.new
@@ -65,10 +65,23 @@ def search_threads(q, username, from_date, to_date, sort, offset, exact_match)
     .limit(RESULTS_PER_PAGE)
     .offset(Sequel.lit('?', offset))
 
+  count_query = VLV::Thread
+    .select(Sequel.lit('count(*) as full_count'))
+    .where(Sequel.lit("(LOWER(threads.creator) = LOWER(?) OR ? = '')", username, username))
+    .where(Sequel.lit("created_at >= ? OR ? IS NULL", from_date, from_date))
+    .where(Sequel.lit("created_at >= ? OR ? IS NULL", to_date, to_date))
+
   if exact_match
-    query.where(Sequel.ilike(:title, "%#{q}%"))
+    filter = Sequel.ilike(:title, "%#{q}%")
+    result = query.where(filter)
+    full_count = count_query.where(filter).first.values[:full_count]
+    [full_count, result]
   else
-    query.full_text_search(:title, Sequel.lit("websearch_to_tsquery(?)", q), tsquery: true, language: 'english')
+    result = query.full_text_search(:title, Sequel.lit("websearch_to_tsquery(?)", q), tsquery: true, language: 'english')
+    full_count = count_query.full_text_search(
+      :title, Sequel.lit("websearch_to_tsquery(?)", q), tsquery: true, language: 'english'
+    ).first.values[:full_count]
+    [full_count, result]
   end
 end
 
@@ -83,13 +96,28 @@ def search_posts(q, username, from_date, to_date, offset, exact_match)
     .offset(Sequel.lit('?', offset))
     .order(Sequel.desc(Sequel.lit('posts.created_at')))
 
+  count_query = VLV::Post
+    .select(Sequel.lit('count(*) as full_count'))
+    .join(Sequel.lit('threads on posts.thread_id = threads.id'))
+    .where(Sequel.lit("(LOWER(posts.creator) = LOWER(?) OR (? = ''))", username, username))
+    .where(Sequel.lit("posts.created_at >= ? OR ? IS NULL", from_date, from_date))
+    .where(Sequel.lit("posts.created_at >= ? OR ? IS NULL", to_date, to_date))
+
   if exact_match
-    query.where(Sequel.ilike(:body, "%#{q}%"))
+    result = query.where(Sequel.ilike(:body, "%#{q}%"))
+    full_count = count_query.where(Sequel.ilike(:body, "%#{q}%")).first.values[:full_count]
+    [full_count, result]
   else
-    query.full_text_search(:tsv, Sequel.lit("websearch_to_tsquery(?)", q), {
+    result = query.full_text_search(:tsv, Sequel.lit("websearch_to_tsquery(?)", q), {
       tsquery: true,
       tsvector: true,
       language: 'english'
     })
+    full_count = count_query.full_text_search(:tsv, Sequel.lit("websearch_to_tsquery(?)", q), {
+      tsquery: true,
+      tsvector: true,
+      language: 'english'
+    }).first.values[:full_count]
+    [full_count, result]
   end
 end

web/server.rb

@@ -44,12 +44,14 @@ class VLVSearch < Sinatra::Base
     unless results[:errors].empty?
       erb :results, { locals: {errors: results[:errors]}, layout: :layout }
     else
-      params[:current_count] = results[:results].to_a.size
+      full_count, records = results[:results]
+      params[:current_count] = records.to_a.size
+      params[:full_count] = full_count
       previous_url, next_url = build_urls(params)
 
       locals =
         params.merge(
-          results: results[:results],
+          results: records,
           previous_url: previous_url,
           next_url: next_url,
           errors: Array.new,
@@ -99,6 +101,7 @@ class VLVSearch < Sinatra::Base
       url_params[:username] = params[:username] if params[:username]
       url_params[:from_date] = params[:from_date] if params[:from_date]
       url_params[:to_date] = params[:to_date] if params[:to_date]
+      url_params[:exact_match] = params[:exact_match] if params[:exact_match]
 
       [
         URI::Generic.build(