From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-598279-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id E81DE1381F3
	for <garchives@archives.gentoo.org>; Sun,  9 Jun 2013 18:10:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 355B6E0802;
	Sun,  9 Jun 2013 18:10:34 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AFB63E0802
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Jun 2013 18:10:33 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9F75F33E349
	for <gentoo-commits@lists.gentoo.org>; Sun,  9 Jun 2013 18:10:32 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 544)
	id 415352171D; Sun,  9 Jun 2013 18:10:31 +0000 (UTC)
From: "Robin H. Johnson (robbat2)" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/xsl: guide.xsl
X-VCS-Repository: gentoo
X-VCS-Files: guide.xsl
X-VCS-Directories: xml/htdocs/xsl
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20130609181031.415352171D@flycatcher.gentoo.org>
Date: Sun,  9 Jun 2013 18:10:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 14766d00-c1f6-460c-b081-3c3188af8a51
X-Archives-Hash: 5da955ceb2b7a80fca583c7cf47704c9

robbat2     13/06/09 18:10:31

  Modified:             guide.xsl
  Log:
  Trim some duplication by improving XSLT string handling for building URLs so protocol-relative URLs always work.

Revision  Changes    Path
1.260                xml/htdocs/xsl/guide.xsl

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.260&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guide.xsl?rev=1.260&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guide.xsl?r1=1.259&r2=1.260

Index: guide.xsl
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guide.xsl,v
retrieving revision 1.259
retrieving revision 1.260
diff -p -w -b -B -u -u -r1.259 -r1.260
--- guide.xsl	9 Jun 2013 17:35:37 -0000	1.259
+++ guide.xsl	9 Jun 2013 18:10:31 -0000	1.260
@@ -953,11 +953,8 @@ Copyright 2001-<xsl:value-of select="sub
 
   <xsl:variable name="llink">
     <xsl:choose>
-      <xsl:when test="starts-with(@link,'http://www.gentoo.org/')">
-        <xsl:value-of select="concat($ROOT, substring-after(@link, 'http://www.gentoo.org/'))"/>
-      </xsl:when>
-      <xsl:when test="starts-with(@link,'https://www.gentoo.org/')">
-        <xsl:value-of select="concat($ROOT, substring-after(@link, 'https://www.gentoo.org/'))"/>
+      <xsl:when test="contains(@link,'//www.gentoo.org/')">
+        <xsl:value-of select="concat($ROOT, substring-after(@link, '//www.gentoo.org/'))"/>
       </xsl:when>
       <xsl:when test="starts-with(@link,'/')">
         <xsl:value-of select="concat($ROOT, substring-after(@link, '/'))"/>
@@ -1004,11 +1001,8 @@ Copyright 2001-<xsl:value-of select="sub
 <xsl:template match="fig">
   <xsl:variable name="llink">
     <xsl:choose>
-      <xsl:when test="starts-with(@link,'http://www.gentoo.org/')">
-        <xsl:value-of select="concat($ROOT, substring-after(@link, 'http://www.gentoo.org/'))"/>
-      </xsl:when>
-      <xsl:when test="starts-with(@link,'https://www.gentoo.org/')">
-        <xsl:value-of select="concat($ROOT, substring-after(@link, 'https://www.gentoo.org/'))"/>
+      <xsl:when test="contains(@link,'//www.gentoo.org/')">
+        <xsl:value-of select="concat($ROOT, substring-after(@link, '//www.gentoo.org/'))"/>
       </xsl:when>
       <xsl:when test="starts-with(@link,'/')">
         <xsl:value-of select="concat($ROOT, substring-after(@link, '/'))"/>
@@ -1349,23 +1343,23 @@ Copyright 2001-<xsl:value-of select="sub
           </xsl:choose>
         </xsl:variable>
 
-        <!-- Strip http://www.gentoo.org from links if running on www.g.o
+        <!-- Strip https?://www.gentoo.org from links if running on www.g.o
              Has no effect on actual www.g.o but helps when surfing on a local copy as long as httphost is set to www as well
-             Rewrite http://www.gentoo.org/cgi-bin/viewcvs/ to use sources.gentoo.org/
+             Rewrite https?://www.gentoo.org/cgi-bin/viewcvs/ to use sources.gentoo.org/
           -->
         <xsl:variable name="llink">
           <xsl:choose>
-            <xsl:when test="starts-with($thelink, 'http://www.gentoo.org/cgi-bin/viewcvs.cgi')">
-				<xsl:value-of select="concat('http://sources.gentoo.org/viewcvs.py', substring-after($thelink, 'http://www.gentoo.org/cgi-bin/viewcvs.cgi'))" />
+            <xsl:when test="contains($thelink, '//www.gentoo.org/cgi-bin/viewcvs.cgi')">
+                <xsl:value-of select="concat('//sources.gentoo.org/viewcvs.py', substring-after($thelink, '//www.gentoo.org/cgi-bin/viewcvs.cgi'))" />
 			</xsl:when>
             <xsl:when test="starts-with($thelink, '/cgi-bin/viewcvs.cgi')">
-				<xsl:value-of select="concat('http://sources.gentoo.org/viewcvs.py', substring-after($thelink, '/cgi-bin/viewcvs.cgi'))" />
+                <xsl:value-of select="concat('//sources.gentoo.org/viewcvs.py', substring-after($thelink, '/cgi-bin/viewcvs.cgi'))" />
 			</xsl:when>
-            <xsl:when test="$httphost='www' and starts-with($thelink, 'http://www.gentoo.org/')">
-				<xsl:value-of select="substring-after($thelink, 'http://www.gentoo.org')" />
+            <xsl:when test="$httphost='www' and contains($thelink, '//www.gentoo.org/')">
+                <xsl:value-of select="substring-after($thelink, '//www.gentoo.org')" />
 			</xsl:when>
             <xsl:when test="not($httphost='www' or $httphost='archives') and starts-with($thelink, '/') and not(starts-with($thelink, '/~'))">
-				<xsl:value-of select="concat('http://www.gentoo.org', $thelink)" />
+                <xsl:value-of select="concat('//www.gentoo.org', $thelink)" />
 			</xsl:when>
             <!-- Add catid to links to /doc/LL/index.xml -->
             <xsl:when test="$catid != '0' and starts-with($thelink, '/doc/') and (substring-after(substring-after($thelink, '/doc/'), '/')='' or substring-after(substring-after($thelink, '/doc/'), '/')='index.xml')">