From 1c6984466243869cf973454272a075807afa7311 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 26 Feb 2024 18:47:56 -0600 Subject: [PATCH] In ElasticFacadeImpl fix issue with index name prefixing and unprefixing when the index name is a comma separated list of index names --- .../moqui/impl/context/ElasticFacadeImpl.groovy | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy b/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy index 40c603096..9b2b77107 100644 --- a/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy +++ b/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy @@ -695,13 +695,23 @@ class ElasticFacadeImpl implements ElasticFacade { if (index == null) return null index = index.trim() if (index.isEmpty()) return null - return indexPrefix != null && !index.startsWith(indexPrefix) ? indexPrefix.concat(index) : index + // handle comma separated index names + return index.split(",").collect({ + it = it.trim() + return indexPrefix != null && !it.startsWith(indexPrefix) ? indexPrefix.concat(it) : it + }).join(",") + // return indexPrefix != null && !index.startsWith(indexPrefix) ? indexPrefix.concat(index) : index } String unprefixIndexName(String index) { if (index == null) return null index = index.trim() if (index.isEmpty()) return null - return indexPrefix != null && index.startsWith(indexPrefix) ? index.substring(indexPrefix.length()) : index + // handle comma separated index names + return index.split(",").collect({ + it = it.trim() + return indexPrefix != null && it.startsWith(indexPrefix) ? it.substring(indexPrefix.length()) : it + }).join(",") + // return indexPrefix != null && index.startsWith(indexPrefix) ? index.substring(indexPrefix.length()) : index } }