Eliminate <ul></ul> generated when there is a <release> element
without <advisory>. Pointed out by: nectar
This commit is contained in:
Hiroki Sato
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
|
|
@ -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)
|
||||
.include "../Makefile.conf"
|
||||
|
|
@ -18,6 +18,8 @@ CLEANFILES+= 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} \
|
||||
--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}
|
||||
|
|
|
|||
|
|
@ -1,46 +1,63 @@
|
|||
<?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:import href="../includes.xsl"/>
|
||||
|
||||
<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="ftpbase" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" />
|
||||
<xsl:variable name="ftpbaseold" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" />
|
||||
<xsl:variable name="ulopen" select="'<ul>'" />
|
||||
<xsl:variable name="ulclose" select="'</ul>'" />
|
||||
<xsl:param name="ftpbase" select="''" />
|
||||
<xsl:param name="ftpbaseold" select="''" />
|
||||
|
||||
<xsl:output type="xml" encoding="iso-8859-1"
|
||||
omit-xml-declaration="yes" />
|
||||
|
||||
<xsl:template match="/">
|
||||
<xsl:value-of select="$ulopen" disable-output-escaping="yes" />
|
||||
<xsl:for-each select="descendant::advisory|descendant::release">
|
||||
<xsl:choose>
|
||||
<xsl:when test="self::release">
|
||||
<xsl:value-of select="$ulclose" disable-output-escaping="yes" />
|
||||
<p><xsl:value-of select="name"/> released.</p>
|
||||
<xsl:value-of select="$ulopen" disable-output-escaping="yes" />
|
||||
</xsl:when>
|
||||
|
||||
<xsl:when test="self::advisory">
|
||||
<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:when>
|
||||
</xsl:choose>
|
||||
</xsl:for-each>
|
||||
<xsl:value-of select="$ulclose" disable-output-escaping="yes" />
|
||||
<xsl:for-each select="descendant::release">
|
||||
|
||||
<xsl:param name="relname" select="string(name)" />
|
||||
<xsl:param name="items" select="//advisory[$relname = string(following::release/name[1])]" />
|
||||
|
||||
<xsl:call-template name="putitems">
|
||||
<xsl:with-param name="items" select="$items" />
|
||||
</xsl:call-template>
|
||||
|
||||
<p><xsl:value-of select="name" /> released.</p>
|
||||
</xsl:for-each>
|
||||
|
||||
<xsl:call-template name="putitems">
|
||||
<xsl:with-param name="items" select="//advisory[not(following::release/name[1])]" />
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="putitems">
|
||||
<xsl:param name="items" select="''" />
|
||||
|
||||
<xsl:if test="$items">
|
||||
<ul>
|
||||
<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:stylesheet>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<advisories>
|
||||
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
|
||||
<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:keywords>
|
||||
|
||||
|
|
@ -15,10 +15,6 @@
|
|||
<day>
|
||||
<name>12</name>
|
||||
|
||||
<advisory>
|
||||
<name>No advisories have yet been issued in 2004</name>
|
||||
</advisory>
|
||||
|
||||
<release>
|
||||
<name>FreeBSD 5.2-RELEASE</name>
|
||||
</release>
|
||||
|
|
|
|||
Loading…
Reference in a new issue