From cf9afcb2136b075404ac99a02e47fd8a83d022dd Mon Sep 17 00:00:00 2001
From: Martynas <martynas@atomgraph.com>
Date: Sun, 8 Oct 2023 23:03:12 +0200
Subject: [PATCH] `ldh:base-uri` strips fragment Replaced `ac:uri()` with
 `ldh:base-uri(.)` Removed `ac:uri` function

---
 .../xsl/bootstrap/2.3.2/client/content.xsl    | 36 +++++++++----------
 .../xsl/bootstrap/2.3.2/client/functions.xsl  |  8 ++---
 .../xsl/bootstrap/2.3.2/client/sparql.xsl     |  6 ----
 .../xsl/bootstrap/2.3.2/layout.xsl            |  6 ++--
 .../atomgraph/linkeddatahub/xsl/client.xsl    | 16 ++++-----
 5 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
index f2fed35ca..612d55609 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
@@ -570,10 +570,10 @@ exclude-result-prefixes="#all"
             <!-- updating existing content -->
             <xsl:when test="$container/@about">
                 <xsl:variable name="content-uri" select="$container/@about" as="xs:anyURI"/>
-                <xsl:variable name="update-string" select="replace($content-update-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+                <xsl:variable name="update-string" select="replace($content-update-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
                 <xsl:variable name="update-string" select="replace($update-string, '$content', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
                 <xsl:variable name="update-string" select="replace($update-string, '$newValue', '&quot;' || $content-string || '&quot;^^&lt;&rdf;XMLLiteral&gt;', 'q')" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+                <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
                 <xsl:variable name="request" as="item()*">
                     <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                         <xsl:call-template name="onXHTMLContentUpdate">
@@ -587,14 +587,14 @@ exclude-result-prefixes="#all"
             <!-- appending new content -->
             <xsl:otherwise>
                 <xsl:variable name="content-id" select="'id' || ac:uuid()" as="xs:string"/>
-                <xsl:variable name="content-uri" select="xs:anyURI(ac:uri() || '#' || $content-id)" as="xs:anyURI"/> <!-- build content URI -->
+                <xsl:variable name="content-uri" select="xs:anyURI(ldh:base-uri(.) || '#' || $content-id)" as="xs:anyURI"/> <!-- build content URI -->
                 <ixsl:set-attribute name="id" select="$content-id" object="$container"/>
                 <ixsl:set-attribute name="about" select="$content-uri" object="$container"/>
 
-                <xsl:variable name="update-string" select="replace($content-append-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+                <xsl:variable name="update-string" select="replace($content-append-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
                 <xsl:variable name="update-string" select="replace($update-string, '$content', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
                 <xsl:variable name="update-string" select="replace($update-string, '$value', '&quot;' || $content-string || '&quot;^^&lt;&rdf;XMLLiteral&gt;', 'q')" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+                <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
                 <xsl:variable name="request" as="item()*">
                     <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                         <xsl:call-template name="onXHTMLContentUpdate">
@@ -628,16 +628,16 @@ exclude-result-prefixes="#all"
                     <!-- updating existing content -->
                     <xsl:when test="$container/@about">
                         <xsl:variable name="content-uri" select="$container/@about" as="xs:anyURI"/>
-                        <xsl:variable name="update-string" select="replace($content-update-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+                        <xsl:variable name="update-string" select="replace($content-update-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="replace($update-string, '$content', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="replace($update-string, '$newValue', '&lt;' || $content-value || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="if ($mode) then replace($update-string, '$newMode', '&lt;' || $mode || '&gt;', 'q') else $update-string" as="xs:string"/>
-                        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+                        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
                         <xsl:variable name="request" as="item()*">
                             <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                                 <xsl:call-template name="onResourceContentUpdate">
                                     <xsl:with-param name="container" select="$container"/>
-                                    <xsl:with-param name="uri" select="ac:uri()"/>
+                                    <xsl:with-param name="uri" select="ldh:base-uri(.)"/>
                                     <xsl:with-param name="content-value" select="$content-value"/>
                                     <xsl:with-param name="mode" select="$mode"/>
                                 </xsl:call-template>
@@ -648,20 +648,20 @@ exclude-result-prefixes="#all"
                     <!-- appending new content -->
                     <xsl:otherwise>
                         <xsl:variable name="content-id" select="'id' || ac:uuid()" as="xs:string"/>
-                        <xsl:variable name="content-uri" select="xs:anyURI(ac:uri() || '#' || $content-id)" as="xs:anyURI"/> <!-- build content URI -->
+                        <xsl:variable name="content-uri" select="xs:anyURI(ldh:base-uri(.) || '#' || $content-id)" as="xs:anyURI"/> <!-- build content URI -->
                         <ixsl:set-attribute name="id" select="$content-id" object="$container"/>
                         <ixsl:set-attribute name="about" select="$content-uri" object="$container"/>
 
-                        <xsl:variable name="update-string" select="replace($content-append-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+                        <xsl:variable name="update-string" select="replace($content-append-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="replace($update-string, '$content', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="replace($update-string, '$value', '&lt;' || $content-value || '&gt;', 'q')" as="xs:string"/>
                         <xsl:variable name="update-string" select="if ($mode) then replace($update-string, '$mode', '&lt;' || $mode || '&gt;', 'q') else $update-string" as="xs:string"/>
-                        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+                        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
                         <xsl:variable name="request" as="item()*">
                             <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                                 <xsl:call-template name="onResourceContentUpdate">
                                     <xsl:with-param name="container" select="$container"/>
-                                    <xsl:with-param name="uri" select="ac:uri()"/>
+                                    <xsl:with-param name="uri" select="ldh:base-uri(.)"/>
                                     <xsl:with-param name="content-value" select="$content-value"/>
                                     <xsl:with-param name="mode" select="$mode"/>
                                 </xsl:call-template>
@@ -686,9 +686,9 @@ exclude-result-prefixes="#all"
                     <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
 
                     <xsl:variable name="content-uri" select="$container/@about" as="xs:anyURI"/>
-                    <xsl:variable name="update-string" select="replace($content-delete-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+                    <xsl:variable name="update-string" select="replace($content-delete-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
                     <xsl:variable name="update-string" select="replace($update-string, '$content', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
-                    <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+                    <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
                     <xsl:variable name="request" as="item()*">
                         <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                             <xsl:call-template name="onContentDelete">
@@ -748,9 +748,7 @@ exclude-result-prefixes="#all"
             <!-- updating existing content -->
             <xsl:when test="$container/@about">
                 <xsl:for-each select="$container">
-                    <xsl:call-template name="ldh:LoadContent">
-<!--                        <xsl:with-param name="uri" select="ac:uri()"/>  content value gets read from dataset.contentValue -->
-                    </xsl:call-template>
+                    <xsl:call-template name="ldh:LoadContent"/>
                 </xsl:for-each>
             </xsl:when> 
             <!-- remove content that hasn't been saved yet -->
@@ -1010,10 +1008,10 @@ exclude-result-prefixes="#all"
             <xsl:variable name="drop-content" select="key('content-by-about', $drop-content-uri)" as="element()"/>
             <xsl:sequence select="ixsl:call(., 'after', [ $drop-content ])"/>
             
-            <xsl:variable name="update-string" select="replace($content-swap-string, '$this', '&lt;' || ac:uri() || '&gt;', 'q')" as="xs:string"/>
+            <xsl:variable name="update-string" select="replace($content-swap-string, '$this', '&lt;' || ldh:base-uri(.) || '&gt;', 'q')" as="xs:string"/>
             <xsl:variable name="update-string" select="replace($update-string, '$targetContent', '&lt;' || $content-uri || '&gt;', 'q')" as="xs:string"/>
             <xsl:variable name="update-string" select="replace($update-string, '$sourceContent', '&lt;' || $drop-content-uri || '&gt;', 'q')" as="xs:string"/>
-            <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:uri())" as="xs:anyURI"/>
+            <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ldh:base-uri(.))" as="xs:anyURI"/>
             <xsl:variable name="request" as="item()*">
                 <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
                     <xsl:call-template name="onContentSwap">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
index 6088e82f0..aa0aa5a08 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
@@ -41,16 +41,16 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'LinkedDataHub.base'))"/>
     </xsl:function>
     
-    <!-- TO-DO: replace with standard XPath `base-uri` after this is fixed: -->
+    <!-- TO-DO: replace with standard XPath `base-uri` after this is fixed: https://saxonica.plan.io/issues/6216 -->
     <xsl:function name="ldh:base-uri" as="xs:anyURI?">
         <xsl:param name="arg" as="node()"/>
         
-        <xsl:sequence select="if (ixsl:contains($arg, 'baseURI')) then ixsl:get($arg, 'baseURI') else ()"/>
+        <xsl:sequence select="if (ixsl:contains($arg, 'baseURI')) then ac:document-uri(ixsl:get($arg, 'baseURI')) else ()"/>
     </xsl:function>
     
-    <xsl:function name="ac:uri" as="xs:anyURI">
+<!--    <xsl:function name="ac:uri" as="xs:anyURI">
         <xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'LinkedDataHub.uri'))"/>
-    </xsl:function>
+    </xsl:function>-->
 
     <xsl:function name="ac:mode" as="xs:anyURI*">
         <xsl:variable name="href" select="ldh:href()" as="xs:anyURI"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/sparql.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/sparql.xsl
index fbc28ba3f..6151e6cd2 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/sparql.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/sparql.xsl
@@ -105,12 +105,6 @@ LIMIT 100</xsl:param>
             </xsl:if>
 
             <fieldset>
-<!--                <label for="query-uri">Query</label>
-                <xsl:text> </xsl:text>
-                <select id="query-uri" name="query-uri" class="input-xxlarge">
-                    <option value="">[Query]</option>
-                </select>-->
-                
                 <label for="service">Service</label>
                 <xsl:text> </xsl:text>
                 <select id="query-service" name="service" class="input-xxlarge">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index 7c51d117f..a7e2aebb7 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -107,7 +107,7 @@ exclude-result-prefixes="#all">
     <xsl:param name="force-exclude-all-namespaces" select="true()"/>
     <xsl:param name="ac:httpHeaders" as="xs:string"/> 
     <xsl:param name="ac:method" as="xs:string"/>
-    <xsl:param name="ac:uri" as="xs:anyURI"/>
+<!--    <xsl:param name="ac:uri" as="xs:anyURI"/>-->
     <xsl:param name="ac:mode" as="xs:anyURI*"/> <!-- select="xs:anyURI('&ac;ReadMode')" -->
     <xsl:param name="acl:mode" as="xs:anyURI*"/>
     <xsl:param name="ldh:forShape" as="xs:anyURI?"/>
@@ -239,9 +239,9 @@ LIMIT   100
     <rdf:Description rdf:about="">
     </rdf:Description>
 
-    <xsl:function name="ac:uri" as="xs:anyURI">
+<!--    <xsl:function name="ac:uri" as="xs:anyURI">
         <xsl:sequence select="$ac:uri"/>
-    </xsl:function>
+    </xsl:function>-->
     
     <xsl:function name="ldh:href" as="xs:anyURI">
         <xsl:sequence select="$ldh:requestUri"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
index 2400d5d4b..239453d47 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -943,7 +943,7 @@ WHERE
                     <!-- if ldh:ContentMode is active, change the page's URL to reflect that -->
                     <xsl:when test="id('content-body', ixsl:page())/div[contains-token(@class, 'row-fluid')][1]/ul[contains-token(@class, 'nav-tabs')]/li[contains-token(@class, 'content-mode')][contains-token(@class, 'active')]">
                         <xsl:variable name="fragment" select="substring-after($href, '#')" as="xs:string"/>
-                        <xsl:sequence select="xs:anyURI(ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:build-uri(ac:uri(), map{ 'mode': '&ldh;ContentMode' } ), $fragment))"/>
+                        <xsl:sequence select="xs:anyURI(ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, ac:build-uri(ldh:base-uri(.), map{ 'mode': '&ldh;ContentMode' } ), $fragment))"/>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:sequence select="$href"/>
@@ -1018,9 +1018,10 @@ WHERE
                 <xsl:variable name="results" select="?body" as="document-node()"/>
                 
                 <xsl:for-each select="$backlinks-container">
+                    <xsl:variable name="doc-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
                     <xsl:result-document href="?." method="ixsl:append-content">
                         <ul class="well well-small nav nav-list">
-                            <xsl:apply-templates select="$results/rdf:RDF/rdf:Description[not(@rdf:about = ac:uri())]" mode="bs2:List">
+                            <xsl:apply-templates select="$results/rdf:RDF/rdf:Description[not(@rdf:about = $doc-uri)]" mode="bs2:List">
                                 <xsl:sort select="ac:label(.)" order="ascending" lang="{$ldt:lang}"/>
                                 <xsl:with-param name="mode" select="ac:mode()[1]" tunnel="yes"/> <!-- TO-DO: support multiple modes -->
                                 <xsl:with-param name="render-id" select="false()" tunnel="yes"/>
@@ -1101,9 +1102,9 @@ WHERE
     
     <!-- intercept all HTML and SVG link clicks except to /uploads/ and those in the navbar (except breadcrumb bar, .brand and app list) and the footer -->
     <!-- resolve URLs against the current document URL because they can be relative -->
-    <xsl:template match="a[not(@target)][starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), 'http://') or starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), 'https://')][not(starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), resolve-uri('uploads/', $ldt:base)))][ancestor::div[@id = 'breadcrumb-nav'] or not(ancestor::div[tokenize(@class, ' ') = ('navbar', 'footer')])] | a[contains-token(@class, 'brand')] | div[button[contains-token(@class, 'btn-apps')]]/ul//a | svg:a[not(@target)][starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), 'http://') or starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), 'https://')][not(starts-with(resolve-uri(@href, ac:document-uri(ac:uri())), resolve-uri('uploads/', $ldt:base)))]" mode="ixsl:onclick">
+    <xsl:template match="a[not(@target)][starts-with(resolve-uri(@href, ldh:base-uri(.)), 'http://') or starts-with(resolve-uri(@href, ldh:base-uri(.)), 'https://')][not(starts-with(resolve-uri(@href, ldh:base-uri(.)), resolve-uri('uploads/', $ldt:base)))][ancestor::div[@id = 'breadcrumb-nav'] or not(ancestor::div[tokenize(@class, ' ') = ('navbar', 'footer')])] | a[contains-token(@class, 'brand')] | div[button[contains-token(@class, 'btn-apps')]]/ul//a | svg:a[not(@target)][starts-with(resolve-uri(@href, ldh:base-uri(.)), 'http://') or starts-with(resolve-uri(@href, ldh:base-uri(.)), 'https://')][not(starts-with(resolve-uri(@href, ldh:base-uri(.)), resolve-uri('uploads/', $ldt:base)))]" mode="ixsl:onclick">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-        <xsl:variable name="href" select="resolve-uri(@href, ac:document-uri(ac:uri()))" as="xs:anyURI"/> <!-- resolve relative URIs -->
+        <xsl:variable name="href" select="resolve-uri(@href, ldh:base-uri(.))" as="xs:anyURI"/> <!-- resolve relative URIs -->
         
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
         
@@ -1160,7 +1161,7 @@ WHERE
         
         <xsl:choose>
             <xsl:when test="?status = 204"> <!-- No Content -->
-                <xsl:variable name="href" select="resolve-uri('..', ac:uri())" as="xs:anyURI"/>
+                <xsl:variable name="href" select="resolve-uri('..', ldh:base-uri(.))" as="xs:anyURI"/>
                 <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), map{}, $href)" as="xs:anyURI"/>
 
                 <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
@@ -1383,8 +1384,7 @@ WHERE
     </xsl:template>
     
     <xsl:template match="button[contains-token(@class, 'btn-delete')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
-        <xsl:variable name="uri" select="ac:uri()" as="xs:anyURI"/>
-        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), ldh:query-params(xs:anyURI('&ac;EditMode')), $uri)" as="xs:anyURI"/>
+        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ldh:absolute-path(ldh:href()), ldh:query-params(xs:anyURI('&ac;EditMode')), ldh:base-uri(.))" as="xs:anyURI"/>
 
         <xsl:if test="ixsl:call(ixsl:window(), 'confirm', [ ac:label(key('resources', 'are-you-sure', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))) ])">
             <xsl:variable name="request" as="item()*">
@@ -1435,7 +1435,7 @@ WHERE
         <xsl:variable name="results-uri" select="if ($query) then ac:build-uri($endpoint, map{ 'query': $query }) else ()" as="xs:anyURI?"/>
         
         <!-- if SPARQL editor is shown, use the SPARQL protocol URI; otherwise use the Linked Data resource URI -->
-        <xsl:variable name="uri" select="if ($results-uri) then $results-uri else ac:uri()" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="if ($results-uri) then $results-uri else ldh:base-uri(.)" as="xs:anyURI"/>
 
         <xsl:call-template name="ldh:ShowAddDataForm">
             <xsl:with-param name="form" as="element()">