fix: del-param impl in url functions

Author: golsch

mycore-base/src/main/resources/xslt/functions/url.xsl

@@ -133,37 +133,34 @@
         </xsl:choose>
     </xsl:function>
 
-    <xsl:function name="mcrurl:del-param" as="xs:string">
-        <xsl:param name="url" as="xs:string?"/>
-        <xsl:param name="par" as="xs:string"/>
+  <xsl:function name="mcrurl:del-param" as="xs:string">
+    <xsl:param name="url" as="xs:string?" />
+    <xsl:param name="par" as="xs:string" />
 
-        <!-- Normalize: XPath has empty-sequence; treat it like empty string. -->
-        <xsl:variable name="u" as="xs:string" select="string($url)"/>
+    <xsl:variable name="u" as="xs:string" select="string($url)" />
 
-        <!-- Escape the parameter name so it is safe to embed into a regex. -->
-        <xsl:variable name="par-esc" as="xs:string"
-                      select="replace($par, '([\\.^$|?*+(){}\[\]-])', '\\$1')"/>
+    <!-- escape param name -->
+    <xsl:variable name="par-esc" as="xs:string" select="replace($par, '([\\.^$|?*+(){}\[\]-])', '\\$1')" />
 
-        <!--
-          Case A: The parameter is NOT the last one (…par=value&…).
-            - If it starts with '?', '?par=value&' collapses to '?'.
-            - If it starts with '&', '&par=value&' collapses to '&'.
-        -->
-        <xsl:variable name="case-a" as="xs:string"
-                      select="replace($u, concat('([?&amp;])', $par-esc, '=[^&amp;]*&amp;'), '$1', 'q')"/>
+    <!-- remove parameter -->
+    <xsl:variable name="step1" as="xs:string" select="
+      replace(
+        $u,
+        concat('([?&amp;])', $par-esc, '=[^&amp;]*(&amp;)?'),
+        '$1'
+      )
+    " />
 
-        <!--
-          Case B: The parameter IS the last one (…?par=value or …&par=value at end).
-          Remove it (including the leading separator) to the end of the string.
-        -->
-        <xsl:variable name="case-b" as="xs:string"
-                      select="replace($u, concat('([?&amp;])', $par-esc, '=[^&amp;]*$'), '', 'q')"/>
+    <!-- cleanup dangling separators -->
+    <xsl:variable name="step2" as="xs:string" select="replace($step1, '\?&amp;?', '?')" />
 
-        <!-- Choose which transformation actually applied; otherwise return the original URL. -->
-        <xsl:sequence select="
-    if ($case-a ne $u) then $case-a
-    else if ($case-b ne $u) then $case-b
-    else $u
-  "/>
-    </xsl:function>
+    <xsl:variable name="step3" as="xs:string" select="replace($step2, '[?&amp;]+$', '')" />
+
+    <!-- final safety: remove trailing '?' -->
+    <xsl:sequence select="
+      if (ends-with($step3, '?'))
+      then substring($step3, 1, string-length($step3) - 1)
+      else $step3
+    " />
+  </xsl:function>
 </xsl:stylesheet>

mycore-base/src/test/java/org/mycore/common/xsl/MCRURLFunctionsTests.java

@@ -33,14 +33,11 @@
 @MyCoReTest
 public class MCRURLFunctionsTests {
 
-    private static final String XSL = "/xslt/functions/url-test.xsl";
-
-    private static final String FUNCTION_PARAM_NAME = "fn-name";
     private static final String URL_PARAM_NAME = "url";
     private static final String PAR_PARAM_NAME = "par";
     private static final String VALUE_PARAM_NAME = "value";
 
-    private static final String URI_PREFIX = "http://mycore.org";
+    private static final String URL_PREFIX = "http://mycore.org";
 
     @ParameterizedTest
     @CsvSource({
@@ -61,7 +58,7 @@ public class MCRURLFunctionsTests {
         "'?foo', foo, ''"
     })
     public void testGetParam(String queryUrl, String param, String expected) throws Exception {
-        assertEquals(expected, getParam(URI_PREFIX + queryUrl, param));
+        assertEquals(expected, getParam(URL_PREFIX + queryUrl, param));
     }
 
     @ParameterizedTest
@@ -84,7 +81,7 @@ public void testGetParam(String queryUrl, String param, String expected) throws
         "'?my-param=bar', my-param, os, '?my-param=os'"
     })
     public void testSetParam(String queryUrl, String param, String value, String expected) throws Exception {
-        assertEquals(URI_PREFIX + expected, setParam(URI_PREFIX + queryUrl, param, value));
+        assertEquals(URL_PREFIX + expected, setParam(URL_PREFIX + queryUrl, param, value));
     }
 
     @ParameterizedTest
@@ -107,7 +104,7 @@ public void testSetParam(String queryUrl, String param, String value, String exp
         "'?foo=bar&foo=os', foo, '?foo=os'"
     })
     public void testDelParam(String queryUrl, String param, String expected) throws Exception {
-        assertEquals(URI_PREFIX + expected, delParam(URI_PREFIX + queryUrl, param));
+        assertEquals(URL_PREFIX + expected, delParam(URL_PREFIX + queryUrl, param));
     }
 
     private String getParam(String url, String param) throws TransformerException {
@@ -125,7 +122,7 @@ private String setParam(String url, String param, String value) throws Transform
         return callFunction("set-param", parameters);
     }
 
-    public String delParam(String url, String param) throws TransformerException {
+    private String delParam(String url, String param) throws TransformerException {
         Map<String, String> parameters = new HashMap<>();
         parameters.put(URL_PARAM_NAME, url);
         parameters.put(PAR_PARAM_NAME, param);
@@ -134,7 +131,7 @@ public String delParam(String url, String param) throws TransformerException {
 
     private String callFunction(String name, Map<String, String> params) throws TransformerException {
         Map<String, Object> parameters = new HashMap<>(params);
-        parameters.put(FUNCTION_PARAM_NAME, name);
-        return MCRTestCaseXSLTUtil.transform(XSL, parameters).getRootElement().getText();
+        parameters.put("fn-name", name);
+        return MCRTestCaseXSLTUtil.transform("/xslt/functions/url-test.xsl", parameters).getRootElement().getText();
     }
 }