Merge pull request #13 from NASA-PDS/i12

Fix SEARCH/ACCESS issue for LIDVID resource references

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>

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.

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 -->