From ac433e37044e4629ecbd225c5a924df8ce19b1c6 Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 13 Oct 2023 10:09:35 -0700
Subject: [PATCH 1/3] Revert Solr URL to Solr deprecated endpoint

---
 src/main/webapp/WEB-INF/web.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 51cfa4a9e..0a8cd3109 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@
   <!-- Search Service base URL -->
   <context-param>
       <param-name>search.url</param-name>
-      <param-value>http://localhost:8983/solr/data</param-value>
+      <param-value>http://localhost:8080/search-service</param-value>
   </context-param>
 
   <!-- DOI Service base URL -->

From 1c5509d713753aed1011c62b61c79bc82777780c Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 13 Oct 2023 14:18:13 -0700
Subject: [PATCH 2/3] Update getResourceLinks to support lidvids

* new getLID method to parse LIDVIDs if they exist
* clear params when >1 resources

Refs #12
---
 .../nasa/pds/dsview/registry/PDS4Search.java  | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/gov/nasa/pds/dsview/registry/PDS4Search.java b/src/main/java/gov/nasa/pds/dsview/registry/PDS4Search.java
index b824c6db9..97980bd2a 100644
--- a/src/main/java/gov/nasa/pds/dsview/registry/PDS4Search.java
+++ b/src/main/java/gov/nasa/pds/dsview/registry/PDS4Search.java
@@ -202,7 +202,7 @@ public SolrDocument getContext(String identifier) throws SolrServerException, IO
 		HttpSolrClient solr = new HttpSolrClient.Builder(solrServerUrl).build();
 		ModifiableSolrParams params = new ModifiableSolrParams();
 
-		params.add("q", "identifier:" + cleanIdentifier(identifier));
+        params.add("q", "identifier:" + cleanIdentifier(identifier));
 		params.set("indent", "on");
 		params.set("wt", "xml");
 
@@ -271,7 +271,8 @@ public Map<String, String> getResourceLinks(List<String> resourceRefList)
       }
 
       for (String resourceRef : resourceRefList) {
-        params.add("q", "identifier:" + cleanIdentifier(resourceRef));
+        params.clear();
+        params.add("q", "identifier:" + cleanIdentifier(getLID(resourceRef)));
         params.set("indent", "on");
         params.set("wt", "xml");
 
@@ -288,7 +289,6 @@ public Map<String, String> getResourceLinks(List<String> resourceRefList)
         while (itr.hasNext()) {
           doc = itr.next();
           log.info("*****************  idx = " + (idx++));
-          // log.info(doc.toString());
 
           String resourceName = "";
           String resourceURL = "";
@@ -375,10 +375,18 @@ else if (doiResponse.length() == 1) {
 			}
 		}
 	}
-	
-	private String cleanIdentifier(String identifier) {
-		return identifier.replace(":", "\\:").replace("\\\\", "\\");
-	}
+
+    private String cleanIdentifier(String identifier) {
+      return identifier.replace(":", "\\:").replace("\\\\", "\\");
+    }
+
+    private String getLID(String identifier) {
+      if (identifier.contains("::")) {
+        return identifier.substring(0, identifier.indexOf("::"));
+      }
+
+      return identifier;
+    }
 
 	/**
 	 * Command line invocation.

From 708d232e34980602fdcddcd06e3aec6c36d91f5d Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 13 Oct 2023 14:19:19 -0700
Subject: [PATCH 3/3] Prep for v2.14.3 tag

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

diff --git a/pom.xml b/pom.xml
index d0a01cd5f..dd2586463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>gov.nasa.pds.2010.portal</groupId>
   <artifactId>ds-view</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
   <packaging>war</packaging>
 
   <name>Data Set View</name>