os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Eliminate <ul></ul> generated when there is a <release> element

Browse source 
without <advisory>.

Pointed out by:	nectar
This commit is contained in:
Hiroki Sato 2004-01-13 22:44:07 +00:00
parent be723fec90
commit 646bff5f5f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=19636
3 changed files with 52 additions and 37 deletions

6
en/security/Makefile
View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/security/Makefile,v 1.8 2003/09/29 16:46:32 hrs Exp $ # $FreeBSD: www/en/security/Makefile,v 1.9 2003/11/24 18:26:33 hrs Exp $
.if exists(../Makefile.conf) .if exists(../Makefile.conf)
.include "../Makefile.conf" .include "../Makefile.conf"
@ -18,6 +18,8 @@ CLEANFILES+= advisories.html.inc
security.html: advisories.html.inc security.html: advisories.html.inc
advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
--param "ftpbase" "'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" \
--param "ftpbaseold" "'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" \
${.CURDIR}/mkindex.xsl ${XML_ADVISORIES} ${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}

77
en/security/mkindex.xsl
View file

@ -1,46 +1,63 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.1 2003/09/29 16:46:32 hrs Exp $ --> <!-- $FreeBSD: www/en/security/mkindex.xsl,v 1.2 2003/10/11 07:12:58 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="../includes.xsl"/> <xsl:import href="../includes.xsl"/>
<xsl:variable name="base" select="'.'"/> <xsl:variable name="base" select="'.'"/>
<xsl:variable name="date" select="'$FreeBSD: www/en/security/mkindex.xsl,v 1.1 2003/09/29 16:46:32 hrs Exp $'"/> <xsl:variable name="date" select="'$FreeBSD: www/en/security/mkindex.xsl,v 1.2 2003/10/11 07:12:58 hrs Exp $'"/>
<xsl:variable name="title" select="'untitled'"/> <xsl:variable name="title" select="'untitled'"/>
<xsl:variable name="ftpbase" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" /> <xsl:param name="ftpbase" select="''" />
<xsl:variable name="ftpbaseold" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" /> <xsl:param name="ftpbaseold" select="''" />
<xsl:variable name="ulopen" select="'&lt;ul&gt;'" />
<xsl:variable name="ulclose" select="'&lt;/ul&gt;'" />
<xsl:output type="xml" encoding="iso-8859-1" <xsl:output type="xml" encoding="iso-8859-1"
omit-xml-declaration="yes" /> omit-xml-declaration="yes" />
<xsl:template match="/"> <xsl:template match="/">
<xsl:value-of select="$ulopen" disable-output-escaping="yes" /> <xsl:for-each select="descendant::release">
<xsl:for-each select="descendant::advisory|descendant::release">
<xsl:choose> <xsl:param name="relname" select="string(name)" />
<xsl:when test="self::release"> <xsl:param name="items" select="//advisory[$relname = string(following::release/name[1])]" />
<xsl:value-of select="$ulclose" disable-output-escaping="yes" />
<p><xsl:value-of select="name"/> released.</p> <xsl:call-template name="putitems">
<xsl:value-of select="$ulopen" disable-output-escaping="yes" /> <xsl:with-param name="items" select="$items" />
</xsl:when> </xsl:call-template>
<xsl:when test="self::advisory"> <p><xsl:value-of select="name" /> released.</p>
<li> </xsl:for-each>
<xsl:choose>
<xsl:when test="./name/@role='old'"> <xsl:call-template name="putitems">
<a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbaseold, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a> <xsl:with-param name="items" select="//advisory[not(following::release/name[1])]" />
</xsl:when> </xsl:call-template>
<xsl:otherwise> </xsl:template>
<a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbase, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a> </xsl:otherwise>
</xsl:choose> <xsl:template name="putitems">
</li> <xsl:param name="items" select="''" />
</xsl:when>
</xsl:choose> <xsl:if test="$items">
</xsl:for-each> <ul>
<xsl:value-of select="$ulclose" disable-output-escaping="yes" /> <xsl:for-each select="$items">
<li>
<xsl:choose>
<xsl:when test="name/@role='old'">
<a><xsl:attribute name="href">
<xsl:value-of select="concat($ftpbaseold, name, '.asc')" />
</xsl:attribute>
<xsl:value-of select="concat(name, '.asc')" /></a>
</xsl:when>
<xsl:otherwise>
<a><xsl:attribute name="href">
<xsl:value-of select="concat($ftpbase, name, '.asc')" />
</xsl:attribute>
<xsl:value-of select="concat(name, '.asc')" /></a>
</xsl:otherwise>
</xsl:choose>
</li>
</xsl:for-each>
</ul>
</xsl:if>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

6
share/sgml/advisories.xml
View file

@ -2,7 +2,7 @@
<advisories> <advisories>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd"> <cvs:keyword name="freebsd">
$FreeBSD: www/share/sgml/advisories.xml,v 1.146 2004/01/12 21:27:00 hrs Exp $ $FreeBSD: www/share/sgml/advisories.xml,v 1.147 2004/01/13 14:05:24 nectar Exp $
</cvs:keyword> </cvs:keyword>
</cvs:keywords> </cvs:keywords>
@ -15,10 +15,6 @@
<day> <day>
<name>12</name> <name>12</name>
<advisory>
<name>No advisories have yet been issued in 2004</name>
</advisory>
<release> <release>
<name>FreeBSD 5.2-RELEASE</name> <name>FreeBSD 5.2-RELEASE</name>
</release> </release>