From c83617ad76f40be89611cc2fd2740e31da7acd93 Mon Sep 17 00:00:00 2001
From: Jesse <admin@Jesses-MacBook-Pro.local>
Date: Tue, 24 Jan 2023 16:11:14 -0500
Subject: [PATCH] potential fix for partial identifier search and ampersand
 regex

---
 public/app/controllers/concerns/searchable.rb   | 1 +
 public/app/views/repositories/show.html.erb     | 2 +-
 public/app/views/search/search_results.html.erb | 4 ++--
 public/app/views/welcome/show.html.erb          | 2 +-
 public/config/locales/en.yml                    | 2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/app/controllers/concerns/searchable.rb b/public/app/controllers/concerns/searchable.rb
index f2c03aed4c..c27702427b 100644
--- a/public/app/controllers/concerns/searchable.rb
+++ b/public/app/controllers/concerns/searchable.rb
@@ -89,6 +89,7 @@ def set_up_advanced_search(default_types = [], default_facets=[], default_search
     advanced_query_builder = AdvancedQueryBuilder.new
     @search[:q].each_with_index { |query, i|
       query.gsub!(/\[\]/x) { |c| "\\" + c }
+      query.gsub!(/\&amp\;/,"&")
       query = '*' if query.blank?
       have_query = true
       op = @search[:op][i]
diff --git a/public/app/views/repositories/show.html.erb b/public/app/views/repositories/show.html.erb
index c672920e57..d0ac3812ed 100644
--- a/public/app/views/repositories/show.html.erb
+++ b/public/app/views/repositories/show.html.erb
@@ -25,5 +25,5 @@
             ["#{t('search_results.filter.creators')}",'creators_text'],
             ["#{t('search_results.filter.subjects')}",'subjects_text'],
             ["#{t('search_results.filter.notes')}", 'notes'],
-            ["#{t('search_results.filter.identifier')}", 'identifier'] ] } %>
+            ["#{t('search_results.filter.identifier')}", 'four_part_id'] ] } %>
 </div>
diff --git a/public/app/views/search/search_results.html.erb b/public/app/views/search/search_results.html.erb
index ff7178114c..6a0aa54c96 100644
--- a/public/app/views/search/search_results.html.erb
+++ b/public/app/views/search/search_results.html.erb
@@ -17,7 +17,7 @@
                                                                        ["#{t('search_results.filter.creators')}",'creators_text'],
                                                                        ["#{t('search_results.filter.subjects')}",'subjects_text'],
                                                                        ["#{t('search_results.filter.notes')}", 'notes'],
-                                                                       ["#{t('search_results.filter.identifier')}", 'identifier'] ],
+                                                                       ["#{t('search_results.filter.identifier')}", 'four_part_id'] ],
                                                     :header_size => '2',
                                                     :show_header => true } %>
   <% else %>
@@ -44,7 +44,7 @@
                                                                          ["#{t('search_results.filter.creators')}",'creators_text'],
                                                                          ["#{t('search_results.filter.subjects')}",'subjects_text'],
                                                                          ["#{t('search_results.filter.notes')}", 'notes'],
-                                                                         ["#{t('search_results.filter.identifier')}", 'identifier'] ],
+                                                                         ["#{t('search_results.filter.identifier')}", 'four_part_id'] ],
                                                       :show_header => false } %>
       </div>
     </div>
diff --git a/public/app/views/welcome/show.html.erb b/public/app/views/welcome/show.html.erb
index 3f3f5476bb..7a994a85df 100644
--- a/public/app/views/welcome/show.html.erb
+++ b/public/app/views/welcome/show.html.erb
@@ -21,7 +21,7 @@
             ["#{t('search_results.filter.creators')}",'creators_text'],
             ["#{t('search_results.filter.subjects')}",'subjects_text'],
             ["#{t('search_results.filter.notes')}", 'notes'],
-            ["#{t('search_results.filter.identifier')}", 'identifier']
+            ["#{t('search_results.filter.identifier')}", 'four_part_id']
            ]
     } %>
 
diff --git a/public/config/locales/en.yml b/public/config/locales/en.yml
index 21291239db..d57d2c0917 100644
--- a/public/config/locales/en.yml
+++ b/public/config/locales/en.yml
@@ -108,6 +108,8 @@ en:
       \ <span class='searchterm'>%{kw}</span>"
     subjects_text_contain: "the <strong>subject</strong> contains\
       \ <span class='searchterm'>%{kw}</span>"
+    four_part_id_contain: "the <strong>identifier</strong> contains\
+      \ <span class='searchterm'>%{kw}</span>"
     identifier_contain: "the <strong>identifier</strong> contains\
       \ <span class='searchterm'>%{kw}</span>"
     in_repository: " in <strong>%{name}</strong>"