From ec1a04a64029f869d941f966571e07592cdfa0c2 Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 27 Sep 2024 16:06:18 -0700
Subject: [PATCH 1/4] Upgrade to solr 9.7.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ac3d1a4..bf835de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
-      <version>9.6.1</version>
+      <version>9.7.0</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>

From 8ab76873d419a65b40aaf0bde7b3067b6a3aafb4 Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 27 Sep 2024 16:07:02 -0700
Subject: [PATCH 2/4] Update servlet to support custom facets

Refs NASA-PDS/registry-legacy-solr#130
---
 .secrets.baseline                                             | 4 ++--
 .../gov/nasa/pds/search/servlet/RegistryLegacyServlet.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 93103fb..47ff461 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -149,7 +149,7 @@
         "filename": "src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java",
         "hashed_secret": "4fb813c304003b3813b35a85f05b7cb0c3994cc1",
         "is_verified": false,
-        "line_number": 121,
+        "line_number": 123,
         "is_secret": false
       }
     ],
@@ -216,5 +216,5 @@
       }
     ]
   },
-  "generated_at": "2024-08-24T23:35:32Z"
+  "generated_at": "2024-09-27T23:06:27Z"
 }
diff --git a/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java b/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
index 0eed06e..f1367c7 100644
--- a/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
+++ b/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
@@ -39,7 +39,9 @@ public class RegistryLegacyServlet extends HttpServlet {
 
   private static List<String> SOLR_QUERY_PARAMS =
       new ArrayList<String>(
-          List.of("q", "sort", "start", "rows", "fq", "fl", "wt", "json.wrf", "_"));
+          List.of("q", "sort", "start", "rows", "fq", "fl", "wt", "json.wrf", "_", "facet.field",
+              "facet", "facet.sort", "facet.mincount", "facet.method", "facet.excludeTerms",
+              "facet.contains"));
   private static List<String> SOLR_FACET_FIELDS =
       new ArrayList<String>(List.of("facet_agency", "facet_instrument", "facet_investigation",
           "facet_target", "facet_type", "facet_pds_model_version", "facet_primary_result_purpose",

From fa16acf45224bb4f14671107c514f8d200f3653a Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 27 Sep 2024 17:28:03 -0700
Subject: [PATCH 3/4] Add additional facet.* fields to allowable query
 parameters

---
 .../gov/nasa/pds/search/servlet/RegistryLegacyServlet.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java b/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
index f1367c7..e91ec1c 100644
--- a/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
+++ b/src/main/java/gov/nasa/pds/search/servlet/RegistryLegacyServlet.java
@@ -41,13 +41,13 @@ public class RegistryLegacyServlet extends HttpServlet {
       new ArrayList<String>(
           List.of("q", "sort", "start", "rows", "fq", "fl", "wt", "json.wrf", "_", "facet.field",
               "facet", "facet.sort", "facet.mincount", "facet.method", "facet.excludeTerms",
-              "facet.contains"));
+              "facet.pivot", "facet.contains"));
   private static List<String> SOLR_FACET_FIELDS =
       new ArrayList<String>(List.of("facet_agency", "facet_instrument", "facet_investigation",
           "facet_target", "facet_type", "facet_pds_model_version", "facet_primary_result_purpose",
           "facet_primary_result_processing_level"));
   private static List<String> REQUEST_HANDLERS =
-      new ArrayList<String>(List.of("search", "archive-filter", "select"));
+      new ArrayList<String>(List.of("search", "archive-filter", "select", "keyword"));
   private static String REQUEST_HANDLER_PARAM = "qt";
   private static String SOLR_BASE_URL = "http://localhost:8983/solr";
   private static String SOLR_COLLECTION = "data";

From 73584db44af3065132d0dca0cf09e1ce1cdaa20e Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Mon, 7 Oct 2024 06:32:08 -0700
Subject: [PATCH 4/4] Update default query handler

---
 .secrets.baseline          | 2 +-
 src/main/webapp/search.jsp | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 47ff461..aac713b 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -216,5 +216,5 @@
       }
     ]
   },
-  "generated_at": "2024-09-27T23:06:27Z"
+  "generated_at": "2024-10-07T13:30:59Z"
 }
diff --git a/src/main/webapp/search.jsp b/src/main/webapp/search.jsp
index 95a30e6..95bea6a 100644
--- a/src/main/webapp/search.jsp
+++ b/src/main/webapp/search.jsp
@@ -89,10 +89,10 @@ for (String name : params.keySet()) {
 $(function() {
     //var query = window.location.href.slice(window.location.href.indexOf('?') + 1).split('@@');
     var query = '<%= query %>';
-		$.get('/services/search/search?' + query, function(data) {
-			$('.output').html(data);
-		});
+    $.get('/services/search/search?qt=archive-filter&' + query, function(data) {
+		$('.output').html(data);
 	});
+});
 </script>
 
 </head>
@@ -122,9 +122,6 @@ $(function() {
 	<!-- Added to contain search service  output -->
 	<div class="output"></div>
 
-	<!-- Commented out for new search service functionality -->
-	<!-- jsp:include page="http://pdsbeta:8080/search-service/select/" / -->
-
 	<!-- InstanceEndEditable -->
 
 	<c:import url="/footer.html" context="/include" />