From 3fd51b9dc79664a093d0a52be840ab07a2f5d675 Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Mon, 9 Aug 2021 15:29:45 -0400
Subject: [PATCH 1/7] Add more advanced search filters

---
 dspace/config/spring/api/discovery.xml | 76 +++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 9 deletions(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 9496744b7d..79f165e283 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -123,10 +123,15 @@
                 <ref bean="searchFilterIssued" />
                 <ref bean="searchFilterType" />          
                 <ref bean="searchFilterAbstract" />
-                <ref bean="searchFilterSeries" />
+                <ref bean="searchFilterCallnumber" />
                 <ref bean="searchFilterIdentifier" />
-                <ref bean="searchFilterSponsor" />
+                <ref bean="searchFilterJournalTitle" />
                 <ref bean="searchFilterLanguage" />
+                <ref bean="searchFilterPublisher" />
+                <ref bean="searchFilterRights" />
+                <ref bean="searchFilterSponsor" />
+                <ref bean="searchFilterSeries" />
+                <ref bean="searchFilterVersion" />
                 <ref bean="searchFilterTrnumber" />
                 <ref bean="searchFilterDepartment" />
                 <ref bean="searchFilterAdvisor" />
@@ -245,10 +250,15 @@
                 <ref bean="searchFilterIssued" />
                 <ref bean="searchFilterType" />          
                 <ref bean="searchFilterAbstract" />
-                <ref bean="searchFilterSeries" />
+                <ref bean="searchFilterCallnumber" />
                 <ref bean="searchFilterIdentifier" />
-                <ref bean="searchFilterSponsor" />
+                <ref bean="searchFilterJournalTitle" />
                 <ref bean="searchFilterLanguage" />
+                <ref bean="searchFilterPublisher" />
+                <ref bean="searchFilterRights" />
+                <ref bean="searchFilterSponsor" />
+                <ref bean="searchFilterSeries" />
+                <ref bean="searchFilterVersion" />
                 <ref bean="searchFilterTrnumber" />
                 <ref bean="searchFilterDepartment" />
                 <ref bean="searchFilterAdvisor" />
@@ -337,14 +347,16 @@
                 <ref bean="searchFilterAuthor" />
                 <ref bean="searchFilterSubject" />
                 <ref bean="searchFilterIssued" />
-                <ref bean="searchFilterDepartment" />
-                <ref bean="searchFilterAdvisor" />
-                <ref bean="searchFilterCommitteemember" />
-                <ref bean="searchFilterEtdlevel" />
                 <ref bean="searchFilterType" />
                 <ref bean="searchFilterAbstract" />
+                <ref bean="searchFilterCallnumber" />
                 <ref bean="searchFilterIdentifier" />
                 <ref bean="searchFilterLanguage" />
+                <ref bean="searchFilterRights" />
+                <ref bean="searchFilterDepartment" />
+                <ref bean="searchFilterAdvisor" />
+                <ref bean="searchFilterCommitteemember" />
+                <ref bean="searchFilterEtdlevel" />
                 <ref bean="searchFilterContentInOriginalBundle"/>
                 <ref bean="searchFilterFileNameInOriginalBundle" />
                 <ref bean="searchFilterFileDescriptionInOriginalBundle" />
@@ -636,6 +648,15 @@
         </property>
     </bean>
 
+    <bean id="searchFilterCallnumber" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
+        <property name="indexFieldName" value="callnumber"/>
+        <property name="metadataFields">
+            <list>
+                <value>dc.subject.lcc</value>
+            </list>
+        </property>
+    </bean>
+
     <bean id="searchFilterCommitteemember" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
         <property name="indexFieldName" value="committeemember"/>
         <property name="metadataFields">
@@ -663,6 +684,15 @@
         </property>
     </bean>
 
+    <bean id="searchFilterJournaltitle" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
+        <property name="indexFieldName" value="journaltitle"/>
+        <property name="metadataFields">
+            <list>
+                <value>dc.title.serial</value>
+            </list>
+        </property>
+    </bean>
+
     <bean id="searchFilterLanguage" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
         <property name="indexFieldName" value="language"/>
         <property name="metadataFields">
@@ -682,6 +712,25 @@
         </property>
     </bean>
 
+    <bean id="searchFilterPublisher" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
+        <property name="indexFieldName" value="publisher"/>
+        <property name="metadataFields">
+            <list>
+                <value>dc.publisher</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="searchFilterRights" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
+        <property name="indexFieldName" value="rights"/>
+        <property name="metadataFields">
+            <list>
+                <value>dc.rights</value>
+                <value>dc.rights.uri</value>
+            </list>
+        </property>
+    </bean>
+
     <bean id="searchFilterSeries" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
         <property name="indexFieldName" value="series"/>
         <property name="metadataFields">
@@ -721,6 +770,15 @@
         </property>
     </bean>
 
+    <bean id="searchFilterVersion" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
+        <property name="indexFieldName" value="version"/>
+        <property name="metadataFields">
+            <list>
+                <value>dc.description.version</value>
+            </list>
+        </property>
+    </bean>
+
     <bean id="searchFilterApplicationNumber" class="org.dspace.discovery.configuration.DiscoverySearchFilter">
         <property name="indexFieldName" value="applicationNumber"/>
         <property name="metadataFields">
@@ -777,7 +835,7 @@
 
     <!--Search filter facet configuration beans-->
     <bean id="searchFilterAdvisor" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
-        <property name="indexFieldName" value="advisor"/>
+        <property name="indexFieldName" value="committee chair"/>
         <property name="metadataFields">
             <list>
                 <value>dc.contributor.committeechair</value>

From e5b428fc736c65c8a4d275f5367699b4bdb3fba1 Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Mon, 9 Aug 2021 15:58:51 -0400
Subject: [PATCH 2/7] Correct Journaltitle filter name

---
 dspace/config/spring/api/discovery.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 79f165e283..96682dcc49 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -125,7 +125,7 @@
                 <ref bean="searchFilterAbstract" />
                 <ref bean="searchFilterCallnumber" />
                 <ref bean="searchFilterIdentifier" />
-                <ref bean="searchFilterJournalTitle" />
+                <ref bean="searchFilterJournaltitle" />
                 <ref bean="searchFilterLanguage" />
                 <ref bean="searchFilterPublisher" />
                 <ref bean="searchFilterRights" />
@@ -252,7 +252,7 @@
                 <ref bean="searchFilterAbstract" />
                 <ref bean="searchFilterCallnumber" />
                 <ref bean="searchFilterIdentifier" />
-                <ref bean="searchFilterJournalTitle" />
+                <ref bean="searchFilterJournaltitle" />
                 <ref bean="searchFilterLanguage" />
                 <ref bean="searchFilterPublisher" />
                 <ref bean="searchFilterRights" />

From 853c59bfc1e4ad1ab8807429be58c620479d73f4 Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Tue, 10 Aug 2021 15:15:13 -0400
Subject: [PATCH 3/7] fix committeechair fieldname

---
 dspace/config/spring/api/discovery.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 96682dcc49..4ab053ddb8 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -835,7 +835,7 @@
 
     <!--Search filter facet configuration beans-->
     <bean id="searchFilterAdvisor" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
-        <property name="indexFieldName" value="committee chair"/>
+        <property name="indexFieldName" value="committeechair"/>
         <property name="metadataFields">
             <list>
                 <value>dc.contributor.committeechair</value>

From 1f1509eb2bb9f2aee014c28a13220158c05b2dfa Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Tue, 10 Aug 2021 16:39:44 -0400
Subject: [PATCH 4/7] Add search filter messages

---
 .../aspects/Discovery/i18n/messages.xml         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml b/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
index 01f322128c..4460dd852f 100644
--- a/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
+++ b/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
@@ -51,7 +51,6 @@
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_committeemember">Committee Member</message>
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_etdlevel">Thesis Degree Level</message>
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_department">Department</message>
-    <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_dc.relation.ispartofseries_filter">Series</message>
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_patenttype">Patent Type</message>
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_inventor">Inventor</message>
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_assignee">Assignee</message>
@@ -87,6 +86,7 @@
 
     <message key="xmlui.ArtifactBrowser.AdvancedSearch.type_dc.relation.ispartofseries_filter">Series</message>
 
+    <!-- Titles of Browsing by results, e.g. https://vtechworks.lib.vt.edu/browse?type=dateissued -->
     <message key="xmlui.ArtifactBrowser.AbstractSearch.type_dc.contributor.author_browse">Browsing by: Author</message>
     <message key="xmlui.ArtifactBrowser.AbstractSearch.type_dc.title_browse">Browsing by: Title</message>
     <message key="xmlui.ArtifactBrowser.AbstractSearch.type_dc.subject_browse">Browsing by: Subject</message>
@@ -109,15 +109,21 @@
     <message key="xmlui.ArtifactBrowser.AbstractSearch.type_department_browse">Browsing by: Department</message>
     <message key="xmlui.ArtifactBrowser.AbstractSearch.type_dateissued_dt_browse">Browsing by: Issue date</message>
 
+    <!-- Advanced Search Filter Names in drop down list, e.g. https://vtechworks.lib.vt.edu/discover -->
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.title">Title</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.dateIssued">Date issued</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.keyword">Keyword</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.abstract">Abstract</message>
-    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.series">Series</message>
-    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.mime">Mime-Type</message>
-    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.sponsor">Sponsor</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.callnumber">Call Number</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.identifier">Identifier</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.journaltitle">Journal Title</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.language">Language (ISO)</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.publisher">Publisher</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.rights">Rights</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.sponsor">Sponsor</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.series">Series</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.version">Version</message>
+    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.mime">Mime-Type</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.coverage">Coverage</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.trnumber">Technical Report No.</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.committeemember">Committee Member</message>
@@ -138,6 +144,7 @@
 
     <message key="xmlui.dri2xhtml.structural.pagination-info.nototal">Now showing items {0}-{1}</message>
 
+    <!-- Advanced Search Filter Names that are also Facets and Facet Results title -->
     <message key="xmlui.Discovery.AbstractSearch.type_author">Filter by: Author</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.author">Author</message>
     <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.author_filter">Author</message>
@@ -160,8 +167,6 @@
     <message key="xmlui.Discovery.AbstractSearch.type_assignee">Filter by: Assignee</message>
     <message key="xmlui.Discovery.AbstractSearch.type_inventor">Filter by: Inventor</message>
     <message key="xmlui.Discovery.AbstractSearch.type_patenttype">Filter by: Patent Type</message>
-    <message key="xmlui.ArtifactBrowser.SimpleSearch.filter.dateIssued.year">Date Issued</message>
-
 
     <message key="xmlui.Discovery.AbstractSearch.startswith">Starts with</message>
     <message key="xmlui.Discovery.AbstractSearch.startswith.help">Or enter first few letters:</message>

From 405d6bbe22f81a3a0146bf4804ab285a53c4217b Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Wed, 11 Aug 2021 09:24:22 -0400
Subject: [PATCH 5/7] fix advisor search filter message

---
 dspace/config/spring/api/discovery.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 4ab053ddb8..64456be33e 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -835,7 +835,7 @@
 
     <!--Search filter facet configuration beans-->
     <bean id="searchFilterAdvisor" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
-        <property name="indexFieldName" value="committeechair"/>
+        <property name="indexFieldName" value="advisor"/>
         <property name="metadataFields">
             <list>
                 <value>dc.contributor.committeechair</value>

From 7f769cbf375d2e79ca5e3bf93a5070159bf969df Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Wed, 11 Aug 2021 10:39:26 -0400
Subject: [PATCH 6/7] fix advisor facet name

---
 dspace/config/spring/api/discovery.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 64456be33e..8b1bfee049 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -835,7 +835,7 @@
 
     <!--Search filter facet configuration beans-->
     <bean id="searchFilterAdvisor" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
-        <property name="indexFieldName" value="advisor"/>
+        <property name="indexFieldName" value="Committee Chair"/>
         <property name="metadataFields">
             <list>
                 <value>dc.contributor.committeechair</value>

From cf3c333c082bac8889971ca60b0d000d89644909 Mon Sep 17 00:00:00 2001
From: "Anne S. Lawrence" <alaw@vt.edu>
Date: Wed, 11 Aug 2021 13:13:49 -0400
Subject: [PATCH 7/7] fix advisor facet name

---
 dspace/config/spring/api/discovery.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 8b1bfee049..64456be33e 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -835,7 +835,7 @@
 
     <!--Search filter facet configuration beans-->
     <bean id="searchFilterAdvisor" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
-        <property name="indexFieldName" value="Committee Chair"/>
+        <property name="indexFieldName" value="advisor"/>
         <property name="metadataFields">
             <list>
                 <value>dc.contributor.committeechair</value>