From f1019b464eec5e2f05a7704a808b5b5bfc607451 Mon Sep 17 00:00:00 2001 From: Silvio Hermann Date: Mon, 19 Aug 2024 13:28:10 +0200 Subject: [PATCH 1/2] UBO-353 FSU040THUL-4126 Do not copy connection id of the replaced author --- .../mycore/ubo/basket/BasketName2PIDEditor.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java b/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java index 55185c587..8b5a5935b 100644 --- a/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java +++ b/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java @@ -9,10 +9,6 @@ package org.mycore.ubo.basket; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; @@ -20,6 +16,7 @@ import org.jdom2.Document; import org.jdom2.Element; import org.mycore.common.MCRConstants; +import org.mycore.common.config.MCRConfiguration2; import org.mycore.datamodel.metadata.MCRMetadataManager; import org.mycore.datamodel.metadata.MCRObject; import org.mycore.frontend.basket.MCRBasket; @@ -29,6 +26,10 @@ import org.mycore.ubo.AccessControl; import org.mycore.ubo.DozBibEntryServlet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Servlet invoked by edit-contributors.xml to * change contributor name and pid entries in the basket of bibliography entries @@ -99,6 +100,12 @@ private void changeContributorInBasket(NameEntry nameEntryFromBasket, NameEntry contributor.removeChildren("nameIdentifier", MCRConstants.MODS_NAMESPACE); for (Element child : nameEntryEdited.getModsName().getChildren()) { + // retain all nameIdentifier elements, except of type 'connection' + String typeAttr = child.getAttributeValue("type"); + if ("nameIdentifier".equals(child.getName()) && "connection".equals(typeAttr)) { + continue; + } + if ("namePart".equals(child.getName()) || "nameIdentifier".equals(child.getName())) { if (!child.getTextTrim().isEmpty()) { contributor.addContent(child.clone()); From 7c8e4447e772d75533abc4658e3c88b3001d4717 Mon Sep 17 00:00:00 2001 From: Silvio Hermann Date: Fri, 23 Aug 2024 09:51:43 +0200 Subject: [PATCH 2/2] UBO-353 FSU040THUL-4126 Optimize imports --- .../main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java b/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java index 8b5a5935b..2809e26e7 100644 --- a/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java +++ b/ubo-common/src/main/java/org/mycore/ubo/basket/BasketName2PIDEditor.java @@ -16,7 +16,6 @@ import org.jdom2.Document; import org.jdom2.Element; import org.mycore.common.MCRConstants; -import org.mycore.common.config.MCRConfiguration2; import org.mycore.datamodel.metadata.MCRMetadataManager; import org.mycore.datamodel.metadata.MCRObject; import org.mycore.frontend.basket.MCRBasket;