Update selectOneWithSearchAndReplace to fallback to non-draft repository

geonetwork · Nov 29, 2024 · debe439 · debe439
1 parent 8d09f1c
commit debe439
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/core/src/main/java/org/fao/geonet/kernel/datamanager/draft/DraftMetadataUtils.java b/core/src/main/java/org/fao/geonet/kernel/datamanager/draft/DraftMetadataUtils.java
@@ -693,16 +693,28 @@ public Set<String> getListOfStatusCreatingDraft() {
 
     @Override
     public String selectOneWithSearchAndReplace(String uuid, String search, String replace) {
-        return metadataDraftRepository.selectOneWithSearchAndReplace(uuid, search, replace);
+        String updatedXml = metadataDraftRepository.selectOneWithSearchAndReplace(uuid, search, replace);
+        if (updatedXml == null) {
+            updatedXml = super.selectOneWithSearchAndReplace(uuid, search, replace);
+        }
+        return updatedXml;
     }
 
     @Override
     public String selectOneWithRegexSearchAndReplaceWithFlags(String uuid, String search, String replace, String flags) {
-        return metadataDraftRepository.selectOneWithRegexSearchAndReplaceWithFlags(uuid, search, replace, flags);
+        String updatedXml = metadataDraftRepository.selectOneWithRegexSearchAndReplaceWithFlags(uuid, search, replace, flags);
+        if (updatedXml == null) {
+            updatedXml = super.selectOneWithRegexSearchAndReplaceWithFlags(uuid, search, replace, flags);
+        }
+        return updatedXml;
     }
 
     @Override
     public String selectOneWithRegexSearchAndReplace(String uuid, String search, String replace) {
-        return metadataDraftRepository.selectOneWithSearchAndReplace(uuid, search, replace);
+        String updatedXml = metadataDraftRepository.selectOneWithRegexSearchAndReplace(uuid, search, replace);
+        if (updatedXml == null) {
+            updatedXml = super.selectOneWithRegexSearchAndReplace(uuid, search, replace);
+        }
+        return updatedXml;
     }
 }