Handle case where type is set but there's no identifier

QualitativeDataRepository · Sep 14, 2024 · ffc366c · ffc366c
1 parent 1c7a31a
commit ffc366c
Showing 1 changed file with 45 additions and 44 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java
@@ -990,56 +990,57 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th
                     }
                     logger.fine("Related identifier: " + relatedIdentifier);
                     // For types where we understand the protocol, get the canonical form
-
-                    switch (pubIdType != null ? pubIdType : "none") {
-                    case "DOI":
-                        if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) {
-                            relatedIdentifier = "doi:" + relatedIdentifier;
-                        }
-                        logger.fine("Intermediate Related identifier: " + relatedIdentifier);
-                        try {
-                            GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
-                            relatedIdentifier = pid.asRawIdentifier();
-                        } catch (IllegalArgumentException e) {
-                            logger.warning("Invalid DOI: " + e.getLocalizedMessage());
-                            relatedIdentifier = null;
-                        }
-                        logger.fine("Final Related identifier: " + relatedIdentifier);
-                        break;
-                    case "Handle":
-                        if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) {
-                            relatedIdentifier = "hdl:" + relatedIdentifier;
-                        }
-                        try {
-                            GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
-                            relatedIdentifier = pid.asRawIdentifier();
-                        } catch (IllegalArgumentException e) {
-                            relatedIdentifier = null;
-                        }
-                        break;
-                    case "URL":
-                        break;
-                    default:
-                        if (relatedIdentifier != null) {
-                            //See if it is a GlobalID we know 
+                    if (StringUtils.isNotBlank(relatedIdentifier)) {
+                        switch (pubIdType != null ? pubIdType : "none") {
+                        case "DOI":
+                            if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) {
+                                relatedIdentifier = "doi:" + relatedIdentifier;
+                            }
+                            logger.fine("Intermediate Related identifier: " + relatedIdentifier);
                             try {
                                 GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
                                 relatedIdentifier = pid.asRawIdentifier();
-                                pubIdType = getCanonicalPublicationType(pid.getProtocol());
                             } catch (IllegalArgumentException e) {
+                                logger.warning("Invalid DOI: " + e.getLocalizedMessage());
+                                relatedIdentifier = null;
+                            }
+                            logger.fine("Final Related identifier: " + relatedIdentifier);
+                            break;
+                        case "Handle":
+                            if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) {
+                                relatedIdentifier = "hdl:" + relatedIdentifier;
                             }
-                            // For non-URL types, if a URL is given, split the string to get a schemeUri
                             try {
-                                URL relatedUrl = new URI(relatedIdentifier).toURL();
-                                String protocol = relatedUrl.getProtocol();
-                                String authority = relatedUrl.getAuthority();
-                                String site = String.format("%s://%s", protocol, authority);
-                                relatedIdentifier = relatedIdentifier.substring(site.length());
-                                attributes.put("schemeURI", site);
-                                pubIdType = "URL";
-                            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
-                                // Just an identifier but without a pubIdType we won't include it
-                                logger.warning("Related Identifier found without type: " + relatedIdentifier);
+                                GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
+                                relatedIdentifier = pid.asRawIdentifier();
+                            } catch (IllegalArgumentException e) {
+                                relatedIdentifier = null;
+                            }
+                            break;
+                        case "URL":
+                            break;
+                        default:
+                            if (relatedIdentifier != null) {
+                                // See if it is a GlobalID we know
+                                try {
+                                    GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier);
+                                    relatedIdentifier = pid.asRawIdentifier();
+                                    pubIdType = getCanonicalPublicationType(pid.getProtocol());
+                                } catch (IllegalArgumentException e) {
+                                }
+                                // For non-URL types, if a URL is given, split the string to get a schemeUri
+                                try {
+                                    URL relatedUrl = new URI(relatedIdentifier).toURL();
+                                    String protocol = relatedUrl.getProtocol();
+                                    String authority = relatedUrl.getAuthority();
+                                    String site = String.format("%s://%s", protocol, authority);
+                                    relatedIdentifier = relatedIdentifier.substring(site.length());
+                                    attributes.put("schemeURI", site);
+                                    pubIdType = "URL";
+                                } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
+                                    // Just an identifier but without a pubIdType we won't include it
+                                    logger.warning("Related Identifier found without type: " + relatedIdentifier);
+                                }
                             }
                         }
                     }