Return-Path: 
 <forrest-cvs-return-1042-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 7132 invoked by uid 500); 2 Jul 2003 11:58:47 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 7119 invoked from network); 2 Jul 2003 11:58:47 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 2 Jul 2003 11:58:47 -0000
Received: (qmail 69288 invoked by uid 1352); 2 Jul 2003 11:58:44 -0000
Date: 2 Jul 2003 11:58:44 -0000
Message-ID: <20030702115844.69287.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/stylesheets/aggregates
 relativize-split-linkmap.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/07/02 04:58:44

  Modified:    src/resources/stylesheets absolutize-linkmap.xsl
                        relativize-linkmap.xsl
               src/resources/stylesheets/aggregates
                        relativize-split-linkmap.xsl
  Log:
  Allow arbitrary URL schemes in site.xml and friends.  Thanks to Dave Brondsema
  
  Revision  Changes    Path
  1.3       +2 -2      xml-forrest/src/resources/stylesheets/absolutize-linkmap.xsl
  
  Index: absolutize-linkmap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/absolutize-linkmap.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- absolutize-linkmap.xsl	8 Jan 2003 05:44:34 -0000	1.2
  +++ absolutize-linkmap.xsl	2 Jul 2003 11:58:44 -0000	1.3
  @@ -30,8 +30,8 @@
     <!-- Recursive template to collate @href's -->
     <xsl:template name="absolutize">
       <xsl:param name="node"/>
  -    <!-- Only append ancestor hrefs if we're not a http(s): URL -->
  -    <xsl:if test="not(starts-with($node/@href, 'http:') or starts-with($node/@href, 'https:'))">
  +    <!-- Only append ancestor hrefs if we're not a uri-scheme: URL -->
  +    <xsl:if test="not(contains($node/@href, ':')) or contains(substring-before($node/@href, ':'), '/')">
         <xsl:if test="$node/..">
           <xsl:call-template name="absolutize">
             <xsl:with-param name="node" select="$node/.."/>
  
  
  
  1.7       +1 -1      xml-forrest/src/resources/stylesheets/relativize-linkmap.xsl
  
  Index: relativize-linkmap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/relativize-linkmap.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- relativize-linkmap.xsl	26 Jun 2003 05:50:03 -0000	1.6
  +++ relativize-linkmap.xsl	2 Jul 2003 11:58:44 -0000	1.7
  @@ -59,7 +59,7 @@
   
       <xsl:attribute name="href">
         <xsl:choose>
  -        <xsl:when test="starts-with(., 'http:') or starts-with(., 'https:')">
  +        <xsl:when test="contains(., ':') and not(contains(substring-before(., ':'), '/'))">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:when test="contains(., '.png') or
  
  
  
  1.6       +1 -1      xml-forrest/src/resources/stylesheets/aggregates/relativize-split-linkmap.xsl
  
  Index: relativize-split-linkmap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/aggregates/relativize-split-linkmap.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- relativize-split-linkmap.xsl	26 Jun 2003 05:42:34 -0000	1.5
  +++ relativize-split-linkmap.xsl	2 Jul 2003 11:58:44 -0000	1.6
  @@ -61,7 +61,7 @@
   
       <xsl:attribute name="href">
         <xsl:choose>
  -        <xsl:when test="starts-with(., 'http:') or starts-with(., 'https:')">
  +        <xsl:when test="contains(., ':') and not(contains(substring-before(., ':'), '/'))">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:when test="contains(., '.png') or