Removed usage of base-uri() in bs2:FormControl

AtomGraph · Oct 6, 2023 · dc44a86 · dc44a86
1 parent 9b08ae5
commit dc44a86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
@@ -496,7 +496,6 @@ exclude-result-prefixes="#all"
  <xsl:param name="class" select="'subject input-xxlarge'" as="xs:string?"/>
  <xsl:param name="disabled" select="false()" as="xs:boolean"/>
  <xsl:param name="auto" select="local-name() = 'nodeID' or starts-with(., $ldt:base)" as="xs:boolean"/>
- <xsl:param name="base-uri" select="base-uri()" as="xs:anyURI"/>
 
  <xsl:choose>
  <xsl:when test="not($type = 'hidden')">
@@ -528,7 +527,10 @@ exclude-result-prefixes="#all"
  -->
  <!-- hidden inputs in which we store the old values of the visible input -->
  <input type="hidden" class="old su">
- <xsl:attribute name="value" select="if (local-name() = 'about') then . else resolve-uri(concat('/', ac:uuid()), $base-uri)"/>
+ <!-- TO-DO: the following logic is flaky. Probably related to https://github.com/AtomGraph/LinkedDataHub/issues/179 -->
+ <xsl:variable name="base-uri" select="if (contains($ldh:requestUri, '?')) then substring-before($ldh:requestUri, '?') else $ldh:requestUri" as="xs:anyURI"/>
+ <xsl:variable name="resource-uri" select="resolve-uri(ac:uuid() || '/', $base-uri)" as="xs:anyURI"/>
+ <xsl:attribute name="value" select="if (local-name() = 'about') then . else $resource-uri"/>
  </input>
  <input type="hidden" class="old sb">
  <xsl:attribute name="value" select="if (local-name() = 'nodeID') then . else generate-id()"/>

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
@@ -1185,7 +1185,6 @@ extension-element-prefixes="ixsl"
  <xsl:with-param name="shapes" select="$shapes"/>
  <xsl:with-param name="traversed-ids" select="$traversed-ids" tunnel="yes"/>
  <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
- <xsl:with-param name="base-uri" select="$main-doc/base-uri()"/> <!-- make sure main doc's base URI is used and not the template's (which is empty) -->
  </xsl:apply-templates>
 
  <xsl:apply-templates select="." mode="bs2:PropertyControl">