From 756fa24a10ec145c0a443ffada7b53c704549599 Mon Sep 17 00:00:00 2001 From: Thibault Coupin Date: Tue, 30 Oct 2018 14:47:03 +0100 Subject: [PATCH 1/2] #5245 - fix global id url parsing when parsing OAI --- .../iq/dataverse/api/imports/ImportGenericServiceBean.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java index b5554816c0a..e216dd74594 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java @@ -411,11 +411,13 @@ private String reassignIdentifierAsGlobalId(String identifierString, DatasetDTO if (identifierString.startsWith(GlobalId.HDL_RESOLVER_URL)) { logger.fine("Processing Handle identifier formatted as a resolver URL: "+identifierString); protocol = GlobalId.HDL_PROTOCOL; - index1 = GlobalId.HDL_RESOLVER_URL.length() - 1; + index1 = GlobalId.HDL_RESOLVER_URL.length() - 1; + index2 = identifierString.indexOf("/", index1 + 1); } else if (identifierString.startsWith(GlobalId.DOI_RESOLVER_URL)) { logger.fine("Processing DOI identifier formatted as a resolver URL: "+identifierString); protocol = GlobalId.DOI_PROTOCOL; index1 = GlobalId.DOI_RESOLVER_URL.length() - 1; + index2 = identifierString.indexOf("/", index1 + 1); } else { logger.warning("HTTP Url in supplied as the identifier is neither a Handle nor DOI resolver: "+identifierString); return null; From 73703f807a848504a4e088f60931b520a1fdab69 Mon Sep 17 00:00:00 2001 From: Thibault Coupin Date: Mon, 7 Jan 2019 12:10:21 +0100 Subject: [PATCH 2/2] Remove useless comment --- .../iq/dataverse/api/imports/ImportGenericServiceBean.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java index e216dd74594..9b60993b365 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java @@ -422,7 +422,6 @@ private String reassignIdentifierAsGlobalId(String identifierString, DatasetDTO logger.warning("HTTP Url in supplied as the identifier is neither a Handle nor DOI resolver: "+identifierString); return null; } - // index2 was already found as the index of '/' - so it's still good. } else { logger.warning("Unknown identifier format: "+identifierString); return null;