From fdd5679ca9710a92cb1c4ec00373f2eaeabe4b66 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 9 Oct 2006 06:26:05 +0000
Subject: [PATCH] Fixed olink database access for Saxon and DB5.

---
 xsl/common/olink.xsl | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/xsl/common/olink.xsl b/xsl/common/olink.xsl
index 2c12e9db1..6bd2d4300 100644
--- a/xsl/common/olink.xsl
+++ b/xsl/common/olink.xsl
@@ -14,9 +14,25 @@
   <xsl:param name="targetptr.att" select="''"/>
   <xsl:param name="olink.lang" select="''"/>
 
+  <!-- use root's xml:base if exists -->
+  <xsl:variable name="xml.base" select="/*/@xml:base"/>
+
   <!-- This selection can be customized if needed -->
-  <xsl:variable name="target.database.filename" 
-      select="$target.database.document"/>
+  <xsl:variable name="target.database.filename">
+    <xsl:choose>
+      <xsl:when test="$xml.base != '' and
+                   not(starts-with($target.database.document, 'file:/')) and
+                   not(starts-with($target.database.document, '/'))">
+        <xsl:call-template name="systemIdToBaseURI">
+          <xsl:with-param name="systemId" select="$xml.base"/>
+        </xsl:call-template>
+        <xsl:value-of select="$target.database.document"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$target.database.document"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
 
   <xsl:variable name="target.database" 
       select="document($target.database.filename,/)"/>
-- 
2.40.0