- Added volatile keyword to NcbiPublicationSearchService _instance to prevent stale reads

- Fixed comment for PUBMED_ID regex
- In searchPublicationsForDataset.jsp display the publication Id label when citation is not available.

Author: vagisha

panoramapublic/src/org/labkey/panoramapublic/ncbi/NcbiConstants.java

@@ -4,7 +4,7 @@
 
 public class NcbiConstants
 {
-    /** Regex for validating numeric PubMed/PMC IDs (1-8 digits). */
+    /** Regex for validating PubMed IDs (1-8 digits). Not used for PMC IDs which may be longer. */
     public static final String PUBMED_ID = "^[0-9]{1,8}$"; // https://libguides.library.arizona.edu/c.php?g=406096&p=2779570
 
     public enum DB

panoramapublic/src/org/labkey/panoramapublic/ncbi/NcbiPublicationSearchServiceImpl.java

@@ -58,7 +58,7 @@ public class NcbiPublicationSearchServiceImpl implements NcbiPublicationSearchSe
     private static final Logger LOG = LogHelper.getLogger(NcbiPublicationSearchServiceImpl.class, "Search NCBI for publications associated with Panorama Public datasets");
 
     // Static holder for the service instance
-    private static NcbiPublicationSearchService _instance = new NcbiPublicationSearchServiceImpl();
+    private static volatile NcbiPublicationSearchService _instance = new NcbiPublicationSearchServiceImpl();
 
     public static NcbiPublicationSearchService getInstance()
     {

panoramapublic/src/org/labkey/panoramapublic/view/searchPublicationsForDataset.jsp

@@ -100,7 +100,7 @@
                        data-matchinfo="<%=h(match.getMatchInfo())%>" />
             </td>
             <td>
-                <%=simpleLink(match.getCitation() != null ? match.getCitation() : match.getPublicationUrl(), match.getPublicationUrl()).target("_blank")%>
+                <%=simpleLink(match.getCitation() != null ? match.getCitation() : match.getPublicationIdLabel(), match.getPublicationUrl()).target("_blank")%>
             </td>
             <td><%=h(match.getMatchInfo())%></td>
             <% if (bean.isShowDismissedColumn()) { %>