UBO-294 MODSPerson

pom.xml

@@ -419,6 +419,7 @@
   </developers>
   <modules>
     <module>ubo-common</module>
+    <module>ubo-modsperson</module>
     <module>ubo-webapp</module>
     <module>ubo-cli</module>
   </modules>

ubo-cli/pom.xml

@@ -112,6 +112,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>${project.parent.groupId}</groupId>
+      <artifactId>ubo-modsperson</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-ocfl</artifactId>

ubo-cli/src/main/setup/classifications/nameIdentifier.xml

@@ -38,10 +38,10 @@
       <label xml:lang="en" text="Local ID" />
       <label xml:lang="x-display" text="false" />
     </category>
-    <category ID="connection">
-      <label xml:lang="de" text="Connection ID" />
-      <label xml:lang="en" text="Connection ID" />
-      <label xml:lang="x-display" text="false" />
+    <category ID="modsperson">
+      <label xml:lang="de" text="Modsperson ID" />
+      <label xml:lang="en" text="Modsperson ID" />
+      <label xml:lang="x-display" text="true" />
     </category>
   </categories>
 </mycoreclass>

ubo-common/pom.xml

@@ -355,6 +355,12 @@
       <artifactId>mycore-webtools</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mycore.ubo</groupId>
+      <artifactId>ubo-modsperson</artifactId>
+      <version>dev-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>

ubo-common/src/main/java/org/mycore/ubo/DozBibEntryServlet.java

@@ -17,6 +17,7 @@
 import org.mycore.common.MCRMailer;
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.content.MCRJDOMContent;
+import org.mycore.datamodel.common.MCRLinkTableManager;
 import org.mycore.datamodel.common.MCRXMLMetadataManager;
 import org.mycore.datamodel.metadata.MCRMetaLinkID;
 import org.mycore.datamodel.metadata.MCRMetadataManager;
@@ -29,8 +30,10 @@
 import org.mycore.mods.MCRMODSWrapper;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 public class DozBibEntryServlet extends MCRServlet {
 
@@ -110,6 +113,15 @@ private void deleteEntry(HttpServletRequest req, HttpServletResponse res) throws
             return;
         }
 
+        MCRLinkTableManager linkTableManager = MCRLinkTableManager.getInstance();
+        if (linkTableManager.countReferenceLinkTo(oid) > 0) {
+            Collection<String> linkedIds = linkTableManager.getSourceOf(oid);
+            String message = String.format(Locale.ROOT, "Entry still has %d linked entries: %s",
+                linkedIds.size(), String.join(", ", linkedIds));
+            res.sendError(HttpServletResponse.SC_CONFLICT, message);
+            return;
+        }
+
         obj.getService().setState("deleted");
         Document xml = obj.createXML();
 

ubo-common/src/main/java/org/mycore/ubo/dedup/DeDupCriteriaBuilder.java

@@ -18,6 +18,7 @@
 import org.mycore.datamodel.metadata.MCRObjectID;
 import org.mycore.mods.merger.MCRHyphenNormalizer;
 import org.mycore.ubo.dedup.jpa.DeduplicationKeyManager;
+import org.mycore.ubo.dedup.jpa.DeduplicationKeyManager.DedupType;
 
 import java.text.Normalizer;
 import java.text.Normalizer.Form;
@@ -63,7 +64,8 @@ public void updateDeDupCriteria(Element mods, MCRObjectID id) {
 
         // add new dedup keys, if any
         for (DeDupCriterion criteria : getDeDupCriteria(mods)) {
-            deduplicationKeyManager.addDeduplicationKey(id.toString(), criteria.getType(), criteria.getKey());
+            deduplicationKeyManager.addDeduplicationKey(id.toString(),
+                DedupType.fromString(criteria.getType()), criteria.getKey());
         }
 
         /* add dedup keys for the host, too or not???
@@ -75,10 +77,34 @@ public void updateDeDupCriteria(Element mods, MCRObjectID id) {
         } */
     }
 
+    public void updateDeDupCriteriaPerson(Element modsperson, MCRObjectID id) {
+        // remove existion dedup keys
+        for (Element extension : modsperson.getChildren("extension", MCRConstants.MODS_NAMESPACE)) {
+            extension.removeChildren("dedup");
+            if(extension.getChildren().isEmpty()) {
+                extension.detach();
+            }
+        }
+        DeduplicationKeyManager deduplicationKeyManager = DeduplicationKeyManager.getInstance();
+
+        if (modsperson.getName().equals("mods")) {
+            deduplicationKeyManager.clearDeduplicationKeys(id.toString());
+        }
+        // add new dedup keys, if any
+        for (DeDupCriterion criteria : getDeDupCriteriaPerson(modsperson)) {
+            deduplicationKeyManager.addDeduplicationKey(id.toString(),
+                DedupType.fromString(criteria.getType()), criteria.getKey());
+        }
+    }
+
     private Set<DeDupCriterion> getDeDupCriteria(Element mods) {
         return buildFromMODS(mods);
     }
 
+    private Set<DeDupCriterion> getDeDupCriteriaPerson(Element modsPerson) {
+        return buildFromMODSPerson(modsPerson);
+    }
+
     /**
      * Builds deduplication criteria from the given MODS publication metadata
      */
@@ -102,6 +128,43 @@ public Set<DeDupCriterion> buildFromMODS(Element mods) {
         return criteria;
     }
 
+    /**
+     * Builds deduplication criteria from the given MODS person metadata
+     */
+    public Set<DeDupCriterion> buildFromMODSPerson(Element modsperson) {
+        Set<DeDupCriterion> criteria = new HashSet<>();
+
+        for (Element identifier : removeEmptyElements(getNodes(modsperson,
+            "mods:name[@type='personal']/mods:nameIdentifier"))) {
+            if (identifier.getAttributeValue("type") != null &&
+                !identifier.getAttributeValue("type").equals("connection")) {
+                criteria.add(buildFromNameIdentifier(identifier));
+            }
+        }
+
+        for (Element name : getNodes(modsperson, "mods:name[@type='personal']")) {
+            Element familyName = getNodes(name, "mods:namePart[@type='family']").isEmpty() ?
+                                 null : getNodes(name, "mods:namePart[@type='family']").get(0);
+            Element givenName = getNodes(name, "mods:namePart[@type='given']").isEmpty() ?
+                                null : getNodes(name, "mods:namePart[@type='given']").get(0);
+            if (givenName != null && familyName != null) {
+                criteria.add(buildFromFullName(givenName, familyName));
+            }
+
+            for (Element alternativeName : getNodes(modsperson, "mods:alternativeName")) {
+                Element altFamilyName = getNodes(alternativeName, "mods:namePart[@type='family']") == null ?
+                                        null : getNodes(alternativeName, "mods:namePart[@type='family']").get(0);
+                Element altGivenName = getNodes(alternativeName, "mods:namePart[@type='given']") == null ?
+                                       null : getNodes(alternativeName, "mods:namePart[@type='given']").get(0);
+                if (altGivenName != null && altFamilyName != null) {
+                    criteria.add(buildFromFullName(altGivenName, altFamilyName));
+                }
+            }
+        }
+
+        return criteria;
+    }
+
     /**
      * Helper method to get a list of nodes by specifying an xPath
      *
@@ -147,6 +210,16 @@ public DeDupCriterion buildFromIdentifier(String type, String value) {
         return new DeDupCriterion("identifier", type + ":" + value);
     }
 
+    /**
+     * Builds a deduplication criterion from a mods:nameIdentifier element
+     */
+    public DeDupCriterion buildFromNameIdentifier(Element identifier) {
+        String type = identifier.getAttributeValue("type");
+        String value = identifier.getTextTrim();
+        value = value.replaceAll("-", "");
+        return new DeDupCriterion("nameidentifier", type + ":" + value);
+    }
+
     /**
      * Builds a deduplication criterion for a given mods:shelflocator
      */
@@ -182,7 +255,7 @@ private String getCombinedTitle(Element modsTitle) {
     }
 
     /**
-     * Builds a combined deduplication criterion from a title and author elment.
+     * Builds a combined deduplication criterion from a title and author element.
      * That means both must match together to identify duplicates.
      */
     public DeDupCriterion buildFromTitleAuthor(String title, String author) {
@@ -191,6 +264,16 @@ public DeDupCriterion buildFromTitleAuthor(String title, String author) {
         return new DeDupCriterion("ta", author + ": " + title);
     }
 
+    /**
+     * Builds a combined deduplication criterion from a given and family name.
+     * That means both must match together to identify duplicates.
+     */
+    public DeDupCriterion buildFromFullName(Element givenNameModsPart, Element familyNameModsPart) {
+        String givenName = normalizeText(givenNameModsPart.getTextTrim());
+        String familyName = normalizeText(familyNameModsPart.getTextTrim());
+        return new DeDupCriterion("name", givenName + ":" + familyName);
+    }
+
     /**
      * Normalizes text to be fault tolerant when matching for duplicates.
      * Accents, umlauts, case are normalized. Punctuation and non-alphabetic/non-digit characters are removed.

ubo-common/src/main/java/org/mycore/ubo/dedup/DeDupEventHandler.java

@@ -30,15 +30,22 @@ protected void handleObjectRepaired(MCREvent evt, MCRObject obj) {
 
     @Override
     protected void handleObjectDeleted(MCREvent evt, MCRObject obj) {
-        LOGGER.info("clearing deduplication keys and no duplicates for object " + obj.getId().toString());
+        LOGGER.info("clearing deduplication keys and no duplicates for object " + obj.getId());
         DeduplicationKeyManager.getInstance().clearDeduplicationKeys(obj.getId().toString());
         DeduplicationKeyManager.getInstance().clearNoDuplicates(obj.getId().toString());
 
     }
 
     private void updateDeDupCriteria(MCRObject obj) {
-        LOGGER.info("updating deduplication keys for object " + obj.getId().toString());
+        if (!("mods".equals(obj.getId().getTypeId()) || "modsperson".equals(obj.getId().getTypeId()))) {
+            return;
+        }
+        LOGGER.info("updating deduplication keys for object " + obj.getId());
         Element mods = new MCRMODSWrapper(obj).getMODS();
-        new DeDupCriteriaBuilder().updateDeDupCriteria(mods, obj.getId());
+        if ("mods".equals(obj.getId().getTypeId())) {
+            new DeDupCriteriaBuilder().updateDeDupCriteria(mods, obj.getId());
+        } else {
+            new DeDupCriteriaBuilder().updateDeDupCriteriaPerson(mods, obj.getId());
+        }
     }
 }

ubo-common/src/main/java/org/mycore/ubo/dedup/DeDupResource.java

@@ -12,6 +12,7 @@
 import jakarta.ws.rs.core.Response;
 import org.mycore.ubo.AccessControl;
 import org.mycore.ubo.dedup.jpa.DeduplicationKeyManager;
+import org.mycore.ubo.dedup.jpa.DeduplicationKeyManager.DedupType;
 import org.mycore.ubo.dedup.jpa.DeduplicationNoDuplicate;
 
 import java.util.List;
@@ -23,28 +24,56 @@ public class DeDupResource {
     @Path("list/duplicates")
     @Produces(MediaType.APPLICATION_JSON)
     public Response listDedup(@QueryParam("idSort") String idSortStr, @QueryParam("typeSort") String typeSortStr, @QueryParam("type") String type) {
+        DedupType[] filter = DeduplicationKeyManager.PUBLICATION_CATEGORY_GROUP;
+        if (type != null) {
+            filter = new DedupType[] {
+                DedupType.fromString(type) };
+        }
+        return listDedupIntern(idSortStr, typeSortStr, filter);
+    }
+
+    @GET
+    @Path("list/duplicates-person")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response listDedupPerson(@QueryParam("idSort") String idSortStr, @QueryParam("typeSort") String typeSortStr, @QueryParam("type") String type) {
+        DedupType[] filter = DeduplicationKeyManager.PERSON_CATEGORY_GROUP;
+        if (type != null) {
+            filter = new DedupType[] {
+                DedupType.fromString(type) };
+        }
+        return listDedupIntern(idSortStr, typeSortStr, filter);
+    }
+
+    /**
+     * Returns a sorted list of all duplicates of the given deduplication types.
+     * @param idSortStr sort order of id field (asc, desc, none)
+     * @param typeSortStr sort order of type field (asc, desc, none)
+     * @param dedupTypes all {@link DeduplicationKeyManager.DedupType dedup types} that should be searched for
+     * @return the dedup list
+     */
+    private Response listDedupIntern(String idSortStr, String typeSortStr, DedupType[] dedupTypes) {
 
         if (!AccessControl.currentUserIsAdmin()) {
             return Response.status(Response.Status.FORBIDDEN).build();
         }
 
         DeduplicationKeyManager.SortOrder idSort = idSortStr == null ? DeduplicationKeyManager.SortOrder.NONE :
-                switch (idSortStr) {
-                    case "asc" -> DeduplicationKeyManager.SortOrder.ASC;
-                    case "desc" -> DeduplicationKeyManager.SortOrder.DESC;
-                    case "none" -> DeduplicationKeyManager.SortOrder.NONE;
-                    default -> throw new BadRequestException("Invalid sort order: " + idSortStr);
-                };
+                                                   switch (idSortStr) {
+                                                       case "asc" -> DeduplicationKeyManager.SortOrder.ASC;
+                                                       case "desc" -> DeduplicationKeyManager.SortOrder.DESC;
+                                                       case "none" -> DeduplicationKeyManager.SortOrder.NONE;
+                                                       default -> throw new BadRequestException("Invalid sort order: " + idSortStr);
+                                                   };
 
         DeduplicationKeyManager.SortOrder typeSort = typeSortStr == null ? DeduplicationKeyManager.SortOrder.NONE :
-                switch (typeSortStr) {
-                    case "asc" -> DeduplicationKeyManager.SortOrder.ASC;
-                    case "desc" -> DeduplicationKeyManager.SortOrder.DESC;
-                    case "none" -> DeduplicationKeyManager.SortOrder.NONE;
-                    default -> throw new BadRequestException("Invalid sort order: " + typeSortStr);
-                };
-
-        List<PossibleDuplicate> duplicates = DeduplicationKeyManager.getInstance().getDuplicates(idSort, typeSort, type);
+                                                     switch (typeSortStr) {
+                                                         case "asc" -> DeduplicationKeyManager.SortOrder.ASC;
+                                                         case "desc" -> DeduplicationKeyManager.SortOrder.DESC;
+                                                         case "none" -> DeduplicationKeyManager.SortOrder.NONE;
+                                                         default -> throw new BadRequestException("Invalid sort order: " + typeSortStr);
+                                                     };
+
+        List<PossibleDuplicate> duplicates = DeduplicationKeyManager.getInstance().getDuplicates(idSort, typeSort, dedupTypes);
         String json = new Gson().toJson(duplicates.toArray(), PossibleDuplicate[].class);
         return Response.ok(json)
                 .header("Access-Control-Allow-Origin", "*")

ubo-common/src/main/java/org/mycore/ubo/dedup/jpa/DeduplicationCriterionResolver.java

@@ -11,6 +11,7 @@
 import org.mycore.mods.MCRMODSWrapper;
 import org.mycore.ubo.dedup.DeDupCriteriaBuilder;
 import org.mycore.ubo.dedup.DeDupCriterion;
+import org.mycore.ubo.dedup.jpa.DeduplicationKeyManager.DedupType;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -54,7 +55,8 @@ public Source resolve(String href, String base) throws TransformerException {
         }
 
         String relation = parts[2];
-        if(!Objects.equals("base", relation) && Objects.equals("parent", relation) && Objects.equals("host", relation)) {
+        if(!(Objects.equals("base", relation) || Objects.equals("parent", relation)
+            || Objects.equals("host", relation) || Objects.equals("person", relation))) {
             LOGGER.error("Unknown relation: {} in {}", relation, href);
             return null;
         }
@@ -80,19 +82,27 @@ public Source resolve(String href, String base) throws TransformerException {
         if(Objects.equals("base", relation) || Objects.equals("parent", relation)) {
             Set<DeDupCriterion> criteria = deDupCriteriaBuilder.buildFromMODS(mods);
             criteria.forEach(criterion -> {
-                possibleDuplicates.addAll(DeduplicationKeyManager.getInstance().getDuplicates(id.toString(), criterion.getType(), criterion.getKey()));
+                possibleDuplicates.addAll(DeduplicationKeyManager.getInstance().getDuplicates(id.toString(),
+                    Objects.requireNonNull(DedupType.fromString(criterion.getType())), criterion.getKey()));
             });
-        } else {
+        } else if (Objects.equals("host", relation)) {
             for (Element host : deDupCriteriaBuilder.getNodes(mods, "mods:relatedItem[@type='host']")) {
                 String externalID = host.getAttributeValue("href", MCRConstants.XLINK_NAMESPACE);
                 if(externalID != null) {
                     // skip external hosts, they get handled by their own object id
                     continue;
                 }
                deDupCriteriaBuilder.buildFromMODS(host).forEach(criterion -> {
-                   possibleDuplicates.addAll(DeduplicationKeyManager.getInstance().getDuplicates(id.toString(), criterion.getType(), criterion.getKey()));
+                   possibleDuplicates.addAll(DeduplicationKeyManager.getInstance().getDuplicates(id.toString(),
+                       Objects.requireNonNull(DedupType.fromString(criterion.getType())), criterion.getKey()));
                });
             }
+        } else {
+            Set<DeDupCriterion> criteria = deDupCriteriaBuilder.buildFromMODSPerson(mods);
+            criteria.forEach(criterion -> {
+                possibleDuplicates.addAll(DeduplicationKeyManager.getInstance().getDuplicates(id.toString(),
+                    Objects.requireNonNull(DedupType.fromString(criterion.getType())), criterion.getKey()));
+            });
         }
 
         possibleDuplicates