Changed formatting for test information output.
Modified variable output in preparation for full support.
Fixed the path on document call for OVAL results.
---
src/share/transforms/media/css/main.css | 6 +-
src/share/transforms/results2html.xsl | 180 ++++++++++++++++++++++---------
2 files changed, 133 insertions(+), 53 deletions(-)
diff --git a/src/share/transforms/media/css/main.css
b/src/share/transforms/media/css/main.css
index 63ec9cb..8ffc678 100644
--- a/src/share/transforms/media/css/main.css
+++ b/src/share/transforms/media/css/main.css
@@ -106,7 +106,11 @@ dl dd dl dd {
}
.details dl dd {
- padding-left: 40px;
+ padding-left: 20px;
+}
+
+.details td {
+ padding-left: 20px;
}
#header {
diff --git a/src/share/transforms/results2html.xsl
b/src/share/transforms/results2html.xsl
index 1d21f7a..c76886b 100644
--- a/src/share/transforms/results2html.xsl
+++ b/src/share/transforms/results2html.xsl
@@ -85,9 +85,11 @@
<div id="results">
<ul id="tree">
<xsl:apply-templates
select="*[local-name(.)='Index']/*[local-name(.)='file']"/>
+ <!-- Will throw warning if applied to an OVAL results XML -->
<xsl:if test="$genOval">
- <xsl:apply-templates
select="document(concat($path,$genOvalRes))//*[local-name(.)='interfaces']"/>
+ <xsl:apply-templates
select="document(concat($path,$genOvalRes))//*[local-name(.)='interfaces']"/>
</xsl:if>
+ <!-- -->
<xsl:apply-templates
select="//*[local-name(.)='interfaces']"/>
<xsl:apply-templates
select="*[local-name(.)='Benchmark']//*[local-name(.)='TestResult']"/>
<xsl:apply-templates
select="*[local-name(.)='oval_results']"/>
@@ -99,12 +101,13 @@
<xsl:template match="*[local-name(.)='Index']">
<xsl:variable name="file"
select="*[local-name(.)='file']"/>
+ <xsl:variable name="fileDoc"
select="document(concat($path,$file))"/>
<xsl:choose>
- <xsl:when
test="document(concat($path,$file))/*[local-name(.)='oval_results']">
- <xsl:apply-templates
select="document($file)//*[local-name(.)='system_info']"/>
+ <xsl:when test="$fileDoc/*[local-name(.)='oval_results']">
+ <xsl:apply-templates
select="$fileDoc//*[local-name(.)='system_info']"/>
</xsl:when>
<xsl:otherwise>
- <xsl:variable name="ovalFile"
select="document(concat($path,$file))//*[local-name(.)='check-content-ref']/@href"/>
+ <xsl:variable name="ovalFile"
select="$fileDoc//*[local-name(.)='check-content-ref']/@href"/>
<xsl:variable name="ovalRes"
select="concat(substring-before($ovalFile, '.xml'),
'.results.xml')"/>
<xsl:apply-templates
select="document(concat($path,$ovalRes))//*[local-name(.)='system_info']"/>
</xsl:otherwise>
@@ -219,7 +222,7 @@
<xsl:template match="*[local-name(.)='Benchmark']">
<xsl:apply-templates
select="document(concat($path,$genOvalRes))//*[local-name(.)='system_info']"/>
<dl id="summary">
- <dt class="title">Benchmark Summary</dt>
+ <dt class="title">Audit Summary</dt>
<dd>
<dl>
<dt>Benchmark ID: </dt>
@@ -500,7 +503,7 @@
<xsl:template match="*[local-name(.)='results']">
<dl id="summary">
- <dt class="title">Benchmark Summary</dt>
+ <dt class="title">Audit Summary</dt>
<dd>
<dl>
<dt>Failures: </dt>
@@ -581,34 +584,28 @@
<xsl:value-of
select="*[local-name(.)='metadata']/*[local-name(.)='title']"/>
<span class="ovalid"> ( <xsl:value-of
select="@id"/> )</span>
</span>
+ <ul>
<xsl:apply-templates
select="*[local-name(.)='criteria']/*[local-name(.)='criterion']">
<xsl:with-param name="defResult"
select="$defResult"/>
</xsl:apply-templates>
+ </ul>
</xsl:template>
<xsl:template match="*[local-name(.)='criterion']">
<xsl:param name="defResult"/>
<xsl:variable name="test_id" select="@test_ref"/>
- <xsl:variable name="testCheck"
select="//*[local-name(.)='results']//*[local-name(.)='test'][@test_id=$test_id]"/>
- <xsl:if test="$testCheck">
- <xsl:variable name="defResult" select="@result"/>
- </xsl:if>
- <ul>
- <li>Test : <xsl:value-of select="$defResult"/><span
class="ovalid"> ( <xsl:value-of select="$test_id"/>
)</span></li>
- <li><xsl:value-of
select="//*[local-name(.)][@id=$test_id]/@comment"/></li>
+ <xsl:variable name="test"
select="//*[local-name(.)='results']//*[local-name(.)='test'][@test_id=$test_id]"/>
+ <xsl:if test="$test">
+ <xsl:variable name="defResult" select="@result"/>
+ </xsl:if>
<li>
- <div>Object</div>
- <xsl:choose>
- <xsl:when test="not($testCheck)">
- <dl class="details">
- <dt>None Collected</dt>
- </dl>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates
select="//*[local-name(.)='results']//*[local-name(.)='test'][@test_id=$test_id]"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of
select="//*[local-name(.)][@id=$test_id]/@comment"/>
+ [ <span class="title"> <xsl:value-of
select="$defResult"/> </span> ]
+ <span class="ovalid"> ( <xsl:value-of
select="$test_id"/> )</span>
</li>
+ <ul>
+ <li>check: <span class="title"> <xsl:value-of
select="$test/@check"/> </span></li>
+ <li>check_existence: <span class="title"> <xsl:value-of
select="$test/@check_existence"/> </span></li>
<li>
<div>State</div>
<xsl:for-each
select="//*[local-name(.)='tests']/*[local-name(.)]">
@@ -625,47 +622,91 @@
</xsl:if>
</xsl:for-each>
</li>
+ <li>
+ <dl class="details">
+ <xsl:choose>
+ <xsl:when test="not($test)">
+ <dt class="title">Nothing Tested</dt>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="$test"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dl>
+ </li>
</ul>
</xsl:template>
<xsl:template match="*[local-name(.)='test']">
-<dl class="details">
- <dt>Collected Items</dt>
- <xsl:for-each select="*[local-name(.)='tested_item']">
+ <xsl:if test="*[local-name(.)='tested_item']">
+ <dt>Tested Items</dt>
+ <xsl:apply-templates
select="*[local-name(.)='tested_item']"/>
+ </xsl:if>
+ <xsl:if test="*[local-name(.)='tested_variable']">
+ <xsl:variable name="var_id"
select="*[local-name(.)='tested_variable']/@variable_id"/>
+ <dt>Tested Variables</dt>
+ <dl>
+ <dt class="toggle"><xsl:value-of
select="//*[local-name(.)='variables']//*[@id=$var_id]/@comment"/></dt>
+ <dd class="hidden">
+ <ul>
+ <xsl:apply-templates
select="*[local-name(.)='tested_variable']"/>
+ </ul>
+ </dd>
+ </dl>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template match="*[local-name(.)='tested_item']">
<xsl:variable name="item_id" select="@item_id"/>
+ <xsl:variable name="result" select="@result"/>
<dd><dl>
<xsl:for-each
select="//*[local-name(.)='system_data']//*[@id=$item_id]">
- <dt><xsl:value-of select="local-name(.)"/> ( ID:
<xsl:value-of select="$item_id"/> )</dt>
- <dd>
- <dl>
+ <dt class="toggle"><xsl:value-of
select="local-name(.)"/> [ <span class="title">
<xsl:value-of select="$result"/> </span> ] </dt>
+ <dd class="hidden">
+ <table>
<xsl:for-each select="*">
- <dt><xsl:value-of select="local-name(.)"/>:
</dt>
- <dd><xsl:value-of select="."/></dd>
+ <tr>
+ <td style="font-weight: normal"><xsl:value-of
select="local-name(.)"/>: </td>
+ <td><xsl:value-of select="."/></td>
+ </tr>
</xsl:for-each>
- </dl>
+ </table>
</dd>
</xsl:for-each>
</dl></dd>
- </xsl:for-each>
-</dl>
+</xsl:template>
+
+<xsl:template match="*[local-name(.)='tested_variable']">
+ <li><xsl:value-of select="."/></li>
+ <!-- <xsl:variable name="result"
select="@result"/>
+ <dd><dl>
+ <xsl:for-each
select="//*[local-name(.)='system_data']//*[@id=$var_id]">
+ <dt class="toggle"><xsl:value-of
select="local-name(.)"/> [ <span class="title">
<xsl:value-of select="$result"/> </span> ] </dt>
+ <dd class="hidden">
+ <table>
+ <xsl:for-each select="*">
+ <tr>
+ <td style="font-weight: normal"><xsl:value-of
select="local-name(.)"/>: </td>
+ <td><xsl:value-of select="."/></td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </dd>
+ </xsl:for-each>
+ </dl></dd>-->
</xsl:template>
<xsl:template match="*[local-name(.)='states']/*">
<dl class="details">
<xsl:for-each select="*">
- <dt><xsl:value-of select="local-name(.)"/></dt>
- <dd>
+ <dt class="toggle"><xsl:value-of
select="local-name(.)"/></dt>
+ <dd class="hidden">
<xsl:if test="@var_ref != ''">
<xsl:variable name="var" select="@var_ref"/>
- <xsl:for-each
select="//*[local-name(.)='variables']/*[local-name(.)]">
- <xsl:if test="@id = $var and local-name(.) =
'external_variable'">
- <xsl:variable name="value_id"
select="$original//*[local-name(.)='check-export'][@export-name=$var]/@value-id"/>
- <dl>
- <dt><xsl:value-of
select="local-name(.)"/></dt>
- <dd><xsl:apply-templates
select="$original//*[local-name(.)='Value'][@id=$value_id]"/></dd>
- </dl>
- </xsl:if>
- </xsl:for-each>
+
+ <xsl:apply-templates
select="//*[local-name(.)='variables']/*[local-name(.)][@id=$var]">
+ <xsl:with-param name="var" select="$var"/>
+ </xsl:apply-templates>
</xsl:if>
<xsl:value-of select="."/>
</dd>
@@ -673,14 +714,49 @@
</dl>
</xsl:template>
+<xsl:template match="*[local-name(.)='external_variable']">
+ <xsl:param name="var"/>
+ <xsl:variable name="value_id"
select="$original//*[local-name(.)='check-export'][@export-name=$var]/@value-id"/>
+ <dl>
+ <dt class="toggle"><xsl:value-of
select="local-name(.)"/></dt>
+ <dd class="hidden"><xsl:apply-templates
select="$original//*[local-name(.)='Value'][@id=$value_id]"/></dd>
+ </dl>
+</xsl:template>
+
+<xsl:template match="*[local-name(.)='constant_variable']">
+ <table>
+ <tr>
+ <xsl:for-each select="*">
+ <td><xsl:value-of
select="local-name(.)"/></td>
+ <td><xsl:value-of select="."/></td>
+ </xsl:for-each>
+ </tr>
+ </table>
+</xsl:template>
+
+<xsl:template match="*[local-name(.)='local_variable']">
+ <table>
+ <tr>
+ <xsl:for-each select="*">
+ <td><xsl:value-of
select="local-name(.)"/></td>
+ <td><xsl:value-of select="."/></td>
+ </xsl:for-each>
+ </tr>
+ </table>
+</xsl:template>
+
<xsl:template match="*[local-name(.)='Value']">
-<dl>
+<table>
<xsl:variable name="value_id" select="@value-id"/>
- <dt><xsl:value-of select="@id"/></dt>
- <dd><xsl:value-of
select="*[local-name(.)='title']"/></dd>
- <dt>value: </dt>
- <dd><xsl:value-of
select="*[local-name(.)='value']"/></dd>
-</dl>
+ <tr>
+ <td style="font-weight: normal"><xsl:value-of
select="@id"/>:</td>
+ <td><xsl:value-of
select="*[local-name(.)='title']"/></td>
+ </tr>
+ <tr>
+ <td style="font-weight: normal">value: </td>
+ <td><xsl:value-of
select="*[local-name(.)='value']"/></td>
+ </tr>
+</table>
</xsl:template>
<xsl:template match="*[local-name(.)='system_info']">
--
1.7.2.2
Show replies by date