Remove unnecessary filtering of news/event feeds
All checks were successful
continuous-integration/drone/push Build is passing

The build script only includes the XML files containing news and events
of the matching tag anyway, so there's absolutely no need to filter by
tag again in the XSL stylesheet.
This commit is contained in:
Reinhard Müller 2020-04-26 19:24:16 +02:00
parent 15ad976413
commit 91dda715ad
31 changed files with 3 additions and 118 deletions

View File

@ -95,9 +95,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="education" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -107,9 +104,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="education" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -117,9 +111,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="education" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'OpenStandards'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'Procurement'"/>
<xsl:with-param name="nb-items" select="15"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'RadioDirective'"/>
<xsl:with-param name="nb-items" select="5"/>
<xsl:with-param name="sidebar" select="'yes'"/>
</xsl:call-template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'routers'"/>
<xsl:with-param name="nb-items" select="15"/>
</xsl:call-template>
</xsl:template>

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -119,9 +116,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -129,9 +123,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'AskYourCandidates'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -9,7 +9,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -9,7 +9,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -9,7 +9,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -9,7 +9,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -9,7 +9,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'ilovefs'"/>
<xsl:with-param name="nb-items" select="2"/>
</xsl:call-template>
</xsl:template>

View File

@ -7,10 +7,8 @@
<xsl:import href="../../fsfe.xsl" />
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'nledu'"/>
<xsl:with-param name="nb-items" select="5"/>
</xsl:call-template>
</xsl:template>

View File

@ -15,7 +15,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'bea'"/>
<xsl:with-param name="nb-items" select="5"/>
<xsl:with-param name="sidebar" select="'yes'"/>
</xsl:call-template>

View File

@ -10,7 +10,6 @@
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'pmpc'"/>
<xsl:with-param name="nb-items" select="5"/>
<xsl:with-param name="sidebar" select="'yes'"/>
</xsl:call-template>

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -120,14 +117,12 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">de</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
<!-- Future events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="tag">de</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
<xsl:with-param name="nb-items" select="3" />
<!--FIXME ↑ why is it showing one more?-->

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -119,9 +116,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -129,9 +123,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -119,9 +116,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -129,9 +123,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -119,9 +116,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -129,9 +123,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="2" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -78,14 +78,6 @@
<xsl:apply-templates select="@*|node()"/>
</xsl:template>
<!--FIXME ↓-->
<xsl:template match="fetch-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'/buildinfo/document/sidebar/@news'"/>
<xsl:with-param name="nb-items" select="4"/>
</xsl:call-template>
</xsl:template>
<!-- Static elements which can be included everywhere -->
<xsl:template match="static-element">
<xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>

View File

@ -12,7 +12,6 @@
<xsl:template match="dynamic-content-news">
<xsl:for-each select="/buildinfo/document/set/news[
translate(@date, '-', '') &lt;= translate($today, '-', '')
and (tags/tag/@key = 'front-page')
]">
<xsl:sort select="@date" order="descending"/>
<xsl:if test="position() &lt;= 3">
@ -161,7 +160,6 @@
<xsl:template match="dynamic-content-events">
<xsl:for-each select="/buildinfo/document/set/event[
translate (@end, '-', '') &gt;= translate ($today, '-', '')
and (tags/tag/@key = 'front-page')
]">
<xsl:sort select="@start"/>
<xsl:if test="position() &lt;= 3">

View File

@ -107,9 +107,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -119,9 +116,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -129,9 +123,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>

View File

@ -1,2 +1,2 @@
news/*/news-*:[legal news]
news/*/.news-*:[legal news]
news/*/news-*:[legal-news]
news/*/.news-*:[legal-news]

View File

@ -7,9 +7,7 @@
<xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
<xsl:template match="legal-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag" select="'legal-news'" />
</xsl:call-template>
<xsl:call-template name="fetch-news"/>
</xsl:template>
</xsl:stylesheet>

View File

@ -9,7 +9,6 @@
<!--display dynamic list of tagged news items-->
<xsl:template name="fetch-news">
<xsl:param name="tag" select="''"/>
<xsl:param name="today" select="/buildinfo/@date" />
<xsl:param name="nb-items" select="''" />
<xsl:param name="display-year" select="'yes'" />
@ -19,7 +18,6 @@
<xsl:for-each select="/buildinfo/document/set/news[
translate(@date, '-', '') &lt;= translate($today, '-', '')
and (tags/tag/@key = $tag or $tag='')
]">
<xsl:sort select="@date" order="descending" />
@ -37,7 +35,6 @@
<!--display dynamic list of tagged event items-->
<xsl:template name="fetch-events">
<xsl:param name="tag" select="''"/>
<xsl:param name="today" select="/buildinfo/@date" />
<xsl:param name="wanted-time" select="future" /> <!-- value in {"past", "present", "future"} -->
<xsl:param name="header" select="''" />
@ -50,7 +47,6 @@
<!-- Past events -->
<xsl:for-each select="/buildinfo/document/set/event[
translate (@end, '-', '') &lt; translate ($today, '-', '')
and (tags/tag/@key = $tag or $tag='')
]">
<xsl:sort select="@end" order="descending" />
<xsl:if test="position() &lt;= $nb-items or $nb-items=''">
@ -68,7 +64,6 @@
<xsl:for-each select="/buildinfo/document/set/event[
translate (@start, '-', '') &lt;= translate ($today, '-', '')
and translate (@end, '-', '') &gt;= translate ($today, '-', '')
and (tags/tag/@key = $tag or $tag='')
]">
<xsl:sort select="@start" order="descending" />
<xsl:if test="position() &lt;= $nb-items or $nb-items=''">
@ -85,7 +80,6 @@
<!-- Future events -->
<xsl:for-each select="/buildinfo/document/set/event[
translate (@start, '-', '') &gt; translate ($today, '-', '')
and (tags/tag/@key = $tag or $tag='')
]">
<xsl:sort select="@start" />
<xsl:if test="position() &lt;= $nb-items or $nb-items=''">

View File

@ -106,9 +106,6 @@
<!--define dynamic list of country news items-->
<xsl:template match="country-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="nb-items" select="3" />
</xsl:call-template>
</xsl:template>
@ -118,9 +115,6 @@
<!-- Current events -->
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'present'" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
@ -128,9 +122,6 @@
<xsl:call-template name="fetch-events">
<xsl:with-param name="wanted-time" select="'future'" />
<xsl:with-param name="nb-items" select="3" />
<xsl:with-param name="tag">
<xsl:value-of select="$country-code" />
</xsl:with-param>
<xsl:with-param name="display-details" select="'yes'" />
</xsl:call-template>
</xsl:template>