diff --git a/lib/search_entries.rb b/lib/search_entries.rb index 4949e793..f199872f 100644 --- a/lib/search_entries.rb +++ b/lib/search_entries.rb @@ -236,10 +236,12 @@ module SearchEntries end def add_hyphens(entry, text) + text = text.tr('\\', ' ') + hyphens = text.scan(/\b[^\s]*?\d-[^\s]+?\b/) + text.scan(/\b[^\s]+-\d[^\s]*?\b/) hyphens.uniq.each_with_index do |item, index| - entry.tsvector += " '#{item.delete("'\\")}':#{index + 1}" unless entry.tsvector.include?(item) + entry.tsvector += " '#{item.delete("'")}':#{index + 1}" unless entry.tsvector.include?(item) end entry diff --git a/lib/submitters.rb b/lib/submitters.rb index 979ba6bc..71041a3d 100644 --- a/lib/submitters.rb +++ b/lib/submitters.rb @@ -49,7 +49,7 @@ module Submitters end def fulltext_search_field(current_user, submitters, keyword, field_name) - keyword = keyword.delete("\0\\") + keyword = keyword.delete("\0").tr('\\', ' ').squish return submitters.none if keyword.blank?