|
 |
df3ea4 |
From 8b43d43533cf4a00de60da71a8aaa6e87776766f Mon Sep 17 00:00:00 2001
|
|
|
df3ea4 |
From: Gabe <redhatrises@gmail.com>
|
|
|
df3ea4 |
Date: Fri, 3 Nov 2017 10:36:57 -0600
|
|
|
df3ea4 |
Subject: [PATCH] Remove CCI formatting from shared table-srgmap XSLT
|
|
|
df3ea4 |
|
|
|
df3ea4 |
- CCI formatting is now done in earlier XSLT transformations.
|
|
|
df3ea4 |
- Fixes #2447
|
|
|
df3ea4 |
---
|
|
|
df3ea4 |
shared/transforms/shared_table-srgmap.xslt | 14 ++++++--------
|
|
|
df3ea4 |
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
df3ea4 |
|
|
|
df3ea4 |
diff --git a/shared/transforms/shared_table-srgmap.xslt b/shared/transforms/shared_table-srgmap.xslt
|
|
|
df3ea4 |
index 4a50dea33..7179f560e 100644
|
|
|
df3ea4 |
--- a/shared/transforms/shared_table-srgmap.xslt
|
|
|
df3ea4 |
+++ b/shared/transforms/shared_table-srgmap.xslt
|
|
|
df3ea4 |
@@ -46,7 +46,7 @@
|
|
|
df3ea4 |
</xsl:choose>
|
|
|
df3ea4 |
|
|
|
df3ea4 |
<xsl:for-each select=".//cdf:Rule">
|
|
|
df3ea4 |
- <xsl:variable name="curr_cci" select="string(number(substring-after(cdf:ident,'CCI-')))"/>
|
|
|
df3ea4 |
+ <xsl:variable name="curr_cci" select="cdf:ident"/>
|
|
|
df3ea4 |
<xsl:choose>
|
|
|
df3ea4 |
|
|
|
df3ea4 |
<xsl:when test="$flat and $items/cdf:reference[@href=$disa-cciuri and text()=$curr_cci]">
|
|
|
df3ea4 |
@@ -77,10 +77,9 @@
|
|
|
df3ea4 |
<xsl:for-each select="$items">
|
|
|
df3ea4 |
<xsl:variable name="item" select="."/>
|
|
|
df3ea4 |
<xsl:for-each select="cdf:reference[@href=$disa-cciuri]">
|
|
|
df3ea4 |
- <xsl:variable name="cci_formatted" select='format-number(self::node()[text()], "000000")' />
|
|
|
df3ea4 |
- <xsl:variable name="cci_expanded" select="concat('CCI-', $cci_formatted)" />
|
|
|
df3ea4 |
- <xsl:variable name="srg_cci" select="$rule/cdf:ident" />
|
|
|
df3ea4 |
- <xsl:if test="$cci_expanded=$srg_cci" >
|
|
|
df3ea4 |
+ <xsl:variable name="ssg_cci" select='self::node()[text()]' />
|
|
|
df3ea4 |
+ <xsl:variable name="srg_cci" select="$rule/cdf:ident" />
|
|
|
df3ea4 |
+ <xsl:if test="$ssg_cci=$srg_cci" >
|
|
|
df3ea4 |
|
|
|
df3ea4 |
|
|
|
df3ea4 |
<xsl:value-of select="$item/cdf:title"/>
|
|
|
df3ea4 |
@@ -100,10 +99,9 @@
|
|
|
df3ea4 |
<xsl:for-each select="$items">
|
|
|
df3ea4 |
<xsl:variable name="item" select="."/>
|
|
|
df3ea4 |
<xsl:for-each select="cdf:reference[@href=$disa-cciuri]">
|
|
|
df3ea4 |
- <xsl:variable name="cci_formatted" select='format-number(self::node()[text()], "000000")' />
|
|
|
df3ea4 |
- <xsl:variable name="cci_expanded" select="concat('CCI-', $cci_formatted)" />
|
|
|
df3ea4 |
+ <xsl:variable name="ssg_cci" select='self::node()[text()]' />
|
|
|
df3ea4 |
<xsl:variable name="srg_cci" select="$rule/cdf:ident" />
|
|
|
df3ea4 |
- <xsl:if test="$cci_expanded=$srg_cci" >
|
|
|
df3ea4 |
+ <xsl:if test="$ssg_cci=$srg_cci" >
|
|
|
df3ea4 |
|
|
|
df3ea4 |
<xsl:value-of select="$rule/cdf:version"/>
|
|
|
df3ea4 |
<xsl:value-of select="$rule/cdf:ident"/>
|