From 29787b268b22a05ad575baee619ec8d1fc4ce107 Mon Sep 17 00:00:00 2001
From: Robert Sehr <robert.sehr@intranda.com>
Date: Tue, 21 Jan 2025 08:07:50 +0100
Subject: [PATCH] update uuids

---
 .../plugins/ArchiveManagementAdministrationPlugin.java    | 8 ++++----
 .../plugins/persistence/ArchiveManagementManager.java     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/ArchiveManagementAdministrationPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/ArchiveManagementAdministrationPlugin.java
index e5a1880..88f62c8 100644
--- a/module-base/src/main/java/de/intranda/goobi/plugins/ArchiveManagementAdministrationPlugin.java
+++ b/module-base/src/main/java/de/intranda/goobi/plugins/ArchiveManagementAdministrationPlugin.java
@@ -654,10 +654,6 @@ private IEadEntry parseElement(int order, int hierarchy, Element element, Intege
             entry.setId("id_" + UUID.randomUUID());
         }
 
-        // generate new id, if id is null
-        if (entry.getId() == null) {
-            entry.setId("id_" + UUID.randomUUID());
-        }
         entry.calculateFingerprint();
 
         if (parent != null) {
@@ -1128,6 +1124,7 @@ public void addNode() {
         }
     }
 
+    @Override
     public void deleteNode() {
         if (selectedEntry != null) {
             IEadEntry parentNode = selectedEntry.getParentNode();
@@ -2380,6 +2377,7 @@ public Document createEadFile() {
         return document;
     }
 
+    @Override
     public String saveArchiveAndLeave() {
         // save current node
         if (selectedEntry != null) {
@@ -2399,6 +2397,7 @@ public String saveArchiveAndLeave() {
 
     }
 
+    @Override
     public String cancelEdition() {
         // reset current settings
         if (selectedEntry != null) {
@@ -2975,6 +2974,7 @@ public IConfiguration getDuplicationConfiguration() {
      * 
      */
 
+    @Override
     public void updateSingleNode() {
         if (selectedEntry != null) {
             if (selectedEntry.getNodeType() == null && configuredNodes != null) {
diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/persistence/ArchiveManagementManager.java b/module-base/src/main/java/de/intranda/goobi/plugins/persistence/ArchiveManagementManager.java
index 40a9349..aad3e02 100644
--- a/module-base/src/main/java/de/intranda/goobi/plugins/persistence/ArchiveManagementManager.java
+++ b/module-base/src/main/java/de/intranda/goobi/plugins/persistence/ArchiveManagementManager.java
@@ -209,7 +209,7 @@ public static synchronized void saveNodes(Integer archiveId, List<IEadEntry> nod
             if (i % 50 == 49 || i + 1 == nodes.size()) {
                 StringBuilder sql = new StringBuilder(insertSql);
                 sql.append(values.toString());
-                sql.append("ON DUPLICATE KEY UPDATE hierarchy = VALUES(hierarchy), order_number = VALUES(order_number), "
+                sql.append("ON DUPLICATE KEY UPDATE  uuid = VALUES(uuid), hierarchy = VALUES(hierarchy), order_number = VALUES(order_number), "
                         + "node_type =  VALUES(node_type), sequence = VALUES(sequence), processtitle = VALUES(processtitle), "
                         + "processtitle = VALUES(processtitle), parent_id = VALUES(parent_id), label = VALUES(label), data = VALUES(data)");
                 try (Connection connection = MySQLHelper.getInstance().getConnection()) {