Add exact match function

lib/search.rb

@@ -1,5 +1,8 @@
 require 'sequel'
 
+require_relative './models/post'
+require_relative './models/thread'
+
 RESULTS_PER_PAGE = 50
 
 def search(params)
@@ -8,6 +11,8 @@ def search(params)
   username = params[:username].strip
   from_date = params[:from_date].strip
   to_date = params[:to_date].strip
+  sort = params[:sort].strip
+  exact_match = params[:exact_match].strip == "yes"
 
   errors = Array.new
 
@@ -39,18 +44,9 @@ def search(params)
 
   results = case params[:type]
   when 'threads'
-    sort =
-      case params[:sort]
-      when 'thread'
-        'created_at DESC'
-      when 'post'
-        'last_post_created_at DESC'
-      else
-        'created_at DESC'
-      end
-    search_threads(query, username, from_date, to_date, sort, offset)
+    search_threads(query, username, from_date, to_date, sort, offset, exact_match)
   when 'posts'
-    search_posts(query, username, from_date, to_date, offset)
+    search_posts(query, username, from_date, to_date, offset, exact_match)
   else
     Array.new
   end
@@ -58,39 +54,40 @@ def search(params)
   {results: results, errors: errors}
 end
 
-def search_threads(query, username, from_date, to_date, sort, offset)
-  DB[<<-SQL, query, username, username, from_date, from_date, to_date, to_date, offset]
-    SELECT
-      threads.*,
-      count(*) OVER() AS full_count
-    FROM threads
-    WHERE
-      to_tsvector(title) @@ plainto_tsquery(?)
-      AND (LOWER(threads.creator) = LOWER(?) OR ? = '')
-      AND (created_at >= ? OR ? IS NULL)
-      AND (created_at <= ? OR ? IS NULL)
-    ORDER BY #{sort}
-    LIMIT #{RESULTS_PER_PAGE}
-    OFFSET ?;
-  SQL
+def search_threads(q, username, from_date, to_date, sort, offset, exact_match)
+  sort = Sequel.desc(params[:sort] == 'post' ? :last_post_created_at : :created_at)
+  query = VLV::Thread
+    .select(Sequel.lit('threads.*, count(*) OVER() 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))
+    .order(sort)
+    .limit(RESULTS_PER_PAGE)
+    .offset(Sequel.lit('?', offset))
+
+  if exact_match
+    query.full_text_search(:title, q, phrase: true)
+  else
+    query.full_text_search(:title, Sequel.lit("websearch_to_tsquery(?)", q), tsquery: true)
+  end
 end
 
-def search_posts(query, username, from_date, to_date, offset)
-  DB[<<-SQL, query, username, username, from_date, from_date, to_date, to_date, offset]
-    SELECT
-      posts.*,
-      threads.title as thread_title,
-      threads.remote_id as remote_thread_id,
-      count(*) OVER() AS full_count
-    FROM posts
-    INNER JOIN threads on posts.thread_id = threads.id
-    WHERE
-      tsv @@ plainto_tsquery(?)
-      AND ((LOWER(posts.creator) = LOWER(?)) OR (? = ''))
-      AND (posts.created_at >= ? OR ? IS NULL)
-      AND (posts.created_at <= ? OR ? IS NULL)
-    ORDER BY posts.created_at DESC
-    LIMIT #{RESULTS_PER_PAGE}
-    OFFSET ?;
-  SQL
+def search_posts(q, username, from_date, to_date, offset, exact_match)
+  query = VLV::Post
+    .select(Sequel.lit('posts.*, threads.title as thread_title, threads.remote_id as remote_thread_id, count(*) OVER() 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))
+    .limit(RESULTS_PER_PAGE)
+    .offset(Sequel.lit('?', offset))
+
+  if exact_match
+    query.full_text_search(:body, q, phrase: true)
+  else
+    query.full_text_search(:tsv, Sequel.lit("websearch_to_tsquery(?)", q), {
+      tsquery: true,
+      tsvector: true
+    })
+  end
 end

web/server.rb

@@ -37,6 +37,7 @@ class VLVSearch < Sinatra::Base
     params[:username] = String.new unless params[:username]
     params[:from_date] = String.new unless params[:from_date]
     params[:to_date] = String.new unless params[:to_date]
+    params[:exact_match] = String.new unless params[:exact_match]
 
     results = search(params)
 

web/views/partials/search.erb

@@ -2,10 +2,21 @@
   <input name="q" type="search" value="<%= params[:q] %>" placeholder="Search for..." class="form__search" required>
   <div class="filters">
     <div class="filters__section">
+      <div class="filters__subsection">
+        <p>Exact match?</p>
+        <label class="form__label">
+          <input type="radio" name="exact_match" value="yes" <% if [nil,true, "yes"].include?(params[:exact_match]) %>checked<% end %>>
+          Yes
+        </label>
+        <label class="form__label">
+          <input type="radio" name="exact_match" value="no" <% if [false, "no"].include?(params[:exact_match]) %>checked<% end %>>
+          No
+        </label>
+      </div>
       <div class="filters__subsection">
         <p>Search in:</p>
         <label class="form__label">
-          <input type="radio" name="type" value="threads" <% if [nil, "threads"].include?(params[:type]) %>checked<% end%>>
+          <input type="radio" name="type" value="threads" <% if [nil, "threads"].include?(params[:type]) %>checked<% end %>>
           Threads
         </label>
         <label class="form__label">
@@ -13,6 +24,8 @@
           Posts
         </label>
       </div>
+    </div>
+    <div class="filters__section">
       <div class="filters__subsection">
         <p>From Date <em>(YYYY-MM-DD)</em>:</p>
         <label class="form__label">
@@ -48,7 +61,7 @@
       <div class="filters__subsection filters__subsection--sort <%= params[:type] == 'threads' ? 'open' : '' %>">
         <p>Sort by:</p>
         <label class="form__label">
-          <input type="radio" name="sort" value="thread" <% if [nil, "thread"].include? params[:sort] %>checked<% end%>>
+          <input type="radio" name="sort" value="thread" <% if [nil, "thread"].include? params[:sort] %>checked<% end %>>
           Thread creation
         </label>
         <label class="form__label">