| author | Jacob Varughese <jacob.varughese@oracle.com> |
| Mon, 23 Feb 2015 09:43:49 -0800 | |
| changeset 3848 | 51518746d397 |
| permissions | -rw-r--r-- |
|
3848
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
1 |
This patch fixes the report to show the benchmark title, description |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
2 |
and version. This patch will be submitted upstream by 2015-Mar-01. |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
3 |
|
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
4 |
--- openscap-1.2.1/xsl/xccdf-report-impl.xsl.~1~ 2015-02-19 13:30:29.206052042 -0800 |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
+++ openscap-1.2.1/xsl/xccdf-report-impl.xsl 2015-02-19 13:30:47.352544165 -0800 |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
@@ -60,15 +60,21 @@ |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
7 |
<xsl:value-of select="$testresult/cdf:target/text()"/> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
8 |
</td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
</tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
- <xsl:if test="$testresult/cdf:benchmark"> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
11 |
+ <xsl:if test="$benchmark/cdf:title"> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
12 |
<tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
13 |
- <th>Benchmark URL</th> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
14 |
- <td><xsl:value-of select="$testresult/cdf:benchmark/@href"/></td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
15 |
+ <th>Benchmark Title</th> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
16 |
+ <td><xsl:value-of select="$benchmark/cdf:title"/></td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
</tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
18 |
- <xsl:if test="$testresult/cdf:benchmark/@id"> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
19 |
+ <xsl:if test="$benchmark/cdf:version"> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
20 |
<tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
21 |
- <th>Benchmark ID</th> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
22 |
- <td><xsl:value-of select="$testresult/cdf:benchmark/@id"/></td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
23 |
+ <th>Benchmark Version</th> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
24 |
+ <td><xsl:value-of select="$benchmark/cdf:version"/></td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
25 |
+ </tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
26 |
+ </xsl:if> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
27 |
+ <xsl:if test="$benchmark/cdf:description"> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
28 |
+ <tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
29 |
+ <th>Benchmark Description</th> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
30 |
+ <td><xsl:value-of select="$benchmark/cdf:description"/></td> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
31 |
</tr> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
32 |
</xsl:if> |
|
51518746d397
20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
33 |
</xsl:if> |