From 5591ffa7203d1fb308574bb1878707e8d2c69e33 Mon Sep 17 00:00:00 2001 From: veronikaslc Date: Tue, 6 Aug 2019 19:00:37 -0400 Subject: [PATCH] PN-413: Add information to the Reference and Matched columns to show institution/group that submitted the case Done --- .../DefaultJSONToMatchingPatientConverter.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/common/src/main/java/org/phenotips/remote/common/internal/api/DefaultJSONToMatchingPatientConverter.java b/core/common/src/main/java/org/phenotips/remote/common/internal/api/DefaultJSONToMatchingPatientConverter.java index a382bd9..4d256a3 100644 --- a/core/common/src/main/java/org/phenotips/remote/common/internal/api/DefaultJSONToMatchingPatientConverter.java +++ b/core/common/src/main/java/org/phenotips/remote/common/internal/api/DefaultJSONToMatchingPatientConverter.java @@ -37,8 +37,7 @@ import org.xwiki.component.manager.ComponentLookupException; import org.xwiki.component.manager.ComponentManager; -import java.net.MalformedURLException; -import java.net.URL; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -364,17 +363,8 @@ private ContactInfo parseContactInfo(JSONObject json) contactInfo.withInstitution(institution); if (href != null && href.startsWith("mailto:")) { - URL emailUrl; - try { - emailUrl = new URL(href); - String emails = emailUrl.getPath(); - if (StringUtils.isNotBlank(emails) && !emails.contains(",")) { - // Only one email in mailto - contactInfo.withEmail(emails); - } - } catch (MalformedURLException e) { - LOGGER.warn("Invalid mailto URL: " + href); - } + String emailList = href.replace("mailto:", ""); + contactInfo.withEmails(Arrays.asList(emailList.split(",|;"))); } return contactInfo.build();