Gentoo Archives: gentoo-commits

From: "Xavier Neys (neysx)" <neysx@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in xml/htdocs/xsl: devlist.xsl
Date: Tue, 03 Nov 2009 21:49:02
Message-Id: E1N5RFJ-0005d4-Oa@stork.gentoo.org
1 neysx 09/11/03 21:48:57
2
3 Modified: devlist.xsl
4 Log:
5 #291062 Allow several <pgpkey> element in userinfo.xml
6
7 Revision Changes Path
8 1.7 xml/htdocs/xsl/devlist.xsl
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/devlist.xsl?rev=1.7&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/devlist.xsl?rev=1.7&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/xsl/devlist.xsl?r1=1.6&r2=1.7
13
14 Index: devlist.xsl
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/devlist.xsl,v
17 retrieving revision 1.6
18 retrieving revision 1.7
19 diff -u -r1.6 -r1.7
20 --- devlist.xsl 14 Aug 2009 16:24:15 -0000 1.6
21 +++ devlist.xsl 3 Nov 2009 21:48:57 -0000 1.7
22 @@ -24,7 +24,9 @@
23 </xsl:otherwise>
24 </xsl:choose>
25 </name>
26 - <pgpkey><xsl:value-of select="pgpkey"/></pgpkey>
27 + <xsl:for-each select="pgpkey">
28 + <pgpkey><xsl:value-of select="."/></pgpkey>
29 + </xsl:for-each>
30 <location>
31 <xsl:if test="location/@longitude and location/@latitude">
32 <xsl:attribute name="lon"><xsl:value-of select="location/@longitude"/></xsl:attribute>
33 @@ -75,7 +77,15 @@
34 </xsl:template>
35
36 <xsl:template match="user">
37 - <xsl:value-of select="concat(@nick, ':', name, ':', location, ':', location/@lat, ':', location/@lon, ':', pgpkey, ':', status, '&#xA;')"/>
38 + <xsl:variable name="pgpkeys">
39 + <xsl:for-each select="pgpkey">
40 + <xsl:value-of select="."/>
41 + <xsl:if test="not(position()=last())">
42 + <xsl:text>,</xsl:text>
43 + </xsl:if>
44 + </xsl:for-each>
45 + </xsl:variable>
46 + <xsl:value-of select="concat(@nick, ':', name, ':', location, ':', location/@lat, ':', location/@lon, ':', $pgpkeys, ':', status, '&#xA;')"/>
47 </xsl:template>
48
49
50 @@ -137,7 +147,9 @@
51 <xsl:element name="user">
52 <xsl:attribute name="username"><xsl:value-of select="@nick"/></xsl:attribute>
53 <realname><xsl:attribute name="fullname"><xsl:value-of select="name/text()"/></xsl:attribute></realname>
54 - <pgpkey><xsl:value-of select="pgpkey"/></pgpkey>
55 + <xsl:for-each select="pgpkey">
56 + <pgpkey><xsl:value-of select="."/></pgpkey>
57 + </xsl:for-each>
58 <location>
59 <xsl:if test="location/@lon and location/@lat">
60 <xsl:attribute name="longitude"><xsl:value-of select="location/@lon"/></xsl:attribute>