[bugfix] Return the correct error code from XQuery Functions that can…

…not find the indicated Collator
eXist-db · Jun 2, 2023 · 6b566e2 · 6b566e2
1 parent 4440873
commit 6b566e2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/exist-core/src/main/java/org/exist/interpreter/Context.java b/exist-core/src/main/java/org/exist/interpreter/Context.java
@@ -43,21 +43,11 @@
 import org.exist.storage.lock.LockedDocumentMap;
 import org.exist.util.hashtable.NamePool;
 import org.exist.xmldb.XmldbURI;
-import org.exist.xquery.AnalyzeContextInfo;
-import org.exist.xquery.Expression;
+import org.exist.xquery.*;
 import org.exist.xquery.FunctionCall;
 import org.exist.xquery.FunctionSignature;
 import org.exist.xquery.LocalVariable;
 import org.exist.xquery.Module;
-import org.exist.xquery.Option;
-import org.exist.xquery.Pragma;
-import org.exist.xquery.Profiler;
-import org.exist.xquery.TerminatedException;
-import org.exist.xquery.UserDefinedFunction;
-import org.exist.xquery.Variable;
-import org.exist.xquery.XPathException;
-import org.exist.xquery.XQueryContext;
-import org.exist.xquery.XQueryWatchDog;
 import org.exist.xquery.value.AnyURIValue;
 import org.exist.xquery.value.BinaryValue;
 import org.exist.xquery.value.NodeValue;
@@ -260,8 +250,29 @@ public interface Context {
 
     String getDefaultCollation();
 
+    /**
+     * Get the Collator.
+     *
+     * @param uri The URI describing the collation and settings
+     *
+     * @return The Collator for the URI
+     *
+     * @throws XPathException if the collation is unknown.
+     */
     Collator getCollator(String uri) throws XPathException;
 
+    /**
+     * Get the Collator.
+     *
+     * @param uri The URI describing the collation and settings
+     * @param errorCode the error code if the URI cannot be resolved
+     *
+     * @return The Collator for the URI
+     *
+     * @throws XPathException if the collation is unknown.
+     */
+    Collator getCollator(String uri, ErrorCodes.ErrorCode errorCode) throws XPathException;
+
     Collator getDefaultCollator();
 
     /**

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1059,6 +1059,11 @@ public String getDefaultCollation() {
 
     @Override
     public Collator getCollator(String uri) throws XPathException {
+        return getCollator(uri, ErrorCodes.XQST0076);
+    }
+
+    @Override
+    public Collator getCollator(String uri, final ErrorCodes.ErrorCode errorCode) throws XPathException {
         if (uri == null) {
             return defaultCollator;
         }
@@ -1076,7 +1081,7 @@ public Collator getCollator(String uri) throws XPathException {
             // no-op
         }
 
-        return Collations.getCollationFromURI(uri, rootExpression);
+        return Collations.getCollationFromURI(uri, rootExpression, errorCode);
     }
 
     @Override

diff --git a/exist-core/src/main/java/org/exist/xquery/functions/fn/CollatingFunction.java b/exist-core/src/main/java/org/exist/xquery/functions/fn/CollatingFunction.java
@@ -22,10 +22,7 @@
 package org.exist.xquery.functions.fn;
 
 import com.ibm.icu.text.Collator;
-import org.exist.xquery.Function;
-import org.exist.xquery.FunctionSignature;
-import org.exist.xquery.XPathException;
-import org.exist.xquery.XQueryContext;
+import org.exist.xquery.*;
 import org.exist.xquery.value.Item;
 import org.exist.xquery.value.Sequence;
 
@@ -53,7 +50,7 @@ protected Collator getCollator(Sequence contextSequence, Item contextItem,
         if (getSignature().getArgumentCount() == arg) {
             final String collationURI = getArgument(arg - 1).eval(contextSequence,
                 contextItem).getStringValue();
-            return context.getCollator(collationURI);
+            return context.getCollator(collationURI, ErrorCodes.FOCH0002);
         } else {
             return context.getDefaultCollator();
         }