From d4469be76426ccedba2bdd591ee38b5742266a21 Mon Sep 17 00:00:00 2001
From: Joey Hagedorn <hagedorn@mcs.anl.gov>
Date: Mon, 19 Dec 2005 22:54:25 +0000
Subject: Modified StatReports to implement new naming convention for
 xsl-transforms and reports. Xsl files can be arbitrarily added by user as
 long as they adhere to naming convention:

<delivery-type>-<delivery mechanism>.xsl



git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1631 ce84e21b-d406-0410-9b95-82705330c041
---
 reports/xsl-transforms/nodes-digest-email.xsl     |  47 ------
 reports/xsl-transforms/nodes-digest-html.xsl      | 174 ----------------------
 reports/xsl-transforms/nodes-digest-mail.xsl      |  47 ++++++
 reports/xsl-transforms/nodes-digest-www.xsl       | 174 ++++++++++++++++++++++
 reports/xsl-transforms/nodes-individual-email.xsl |  25 ----
 reports/xsl-transforms/nodes-individual-mail.xsl  |  25 ++++
 reports/xsl-transforms/timing-perf-html.xsl       |  68 ---------
 reports/xsl-transforms/timing-summary-www.xsl     |  68 +++++++++
 src/sbin/StatReports                              |  32 +---
 9 files changed, 322 insertions(+), 338 deletions(-)
 delete mode 100644 reports/xsl-transforms/nodes-digest-email.xsl
 delete mode 100644 reports/xsl-transforms/nodes-digest-html.xsl
 create mode 100644 reports/xsl-transforms/nodes-digest-mail.xsl
 create mode 100644 reports/xsl-transforms/nodes-digest-www.xsl
 delete mode 100644 reports/xsl-transforms/nodes-individual-email.xsl
 create mode 100644 reports/xsl-transforms/nodes-individual-mail.xsl
 delete mode 100644 reports/xsl-transforms/timing-perf-html.xsl
 create mode 100644 reports/xsl-transforms/timing-summary-www.xsl

diff --git a/reports/xsl-transforms/nodes-digest-email.xsl b/reports/xsl-transforms/nodes-digest-email.xsl
deleted file mode 100644
index 2aeea1ed4..000000000
--- a/reports/xsl-transforms/nodes-digest-email.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml">
-  <xsl:include href="xsl-transform-includes/text-templates.xsl" />
-  <xsl:output method="text" indent="no" media-type="text/plain" />
-  <xsl:template match="Report">
-    <xsl:choose>
-      <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">Subject: BCFG Nightly Errors (<xsl:value-of select="@name" />)
-    </xsl:when>
-    <xsl:otherwise>Subject: BCFG Nightly Good (<xsl:value-of select="@name" />)
-  </xsl:otherwise>
-</xsl:choose>
-<xsl:text>
-</xsl:text>Report Run @ <xsl:value-of select="@time" />
-
-SUMMARY:
-<xsl:text>    </xsl:text>
-<xsl:value-of select="count(/Report/Node)" /> nodes were included in your report.<xsl:text>
-</xsl:text>
-<xsl:if test="count(/Report/Node)-count(/Report/Node/Statistics/Good) = 0">
-  <xsl:text>    </xsl:text>All machines are configured to specification.
-</xsl:if><xsl:if test="count(/Report/Node/Statistics/Good) > 0">
-<xsl:text>    </xsl:text>
-<xsl:value-of select="count(/Report/Node/Statistics/Good)" /> nodes are clean.
-</xsl:if>
-<xsl:if test="count(/Report/Node/Statistics/Bad) > 0">
-  <xsl:text>    </xsl:text>
-  <xsl:value-of select="count(/Report/Node/Statistics/Bad)" /> nodes are bad.
-</xsl:if>
-<xsl:if test="count(/Report/Node/Statistics/Extra) > 0">
-  <xsl:text>    </xsl:text>
-  <xsl:value-of select="count(/Report/Node/Statistics/Extra)" /> nodes contain extra configuration. (includes both good and bad nodes)
-</xsl:if>
-<xsl:if test="count(/Report/Node/Statistics/Modified) > 0">
-  <xsl:text>    </xsl:text>
-  <xsl:value-of select="count(/Report/Node/Statistics/Modified)" /> nodes were modified in the last run. (includes both good and bad nodes)
-</xsl:if>
-<xsl:if test="count(/Report/Node/Statistics/Stale) > 0">
-  <xsl:text>    </xsl:text>
-  <xsl:value-of select="count(/Report/Node/Statistics/Stale)" /> nodes did not run within the last 24 hours.
-</xsl:if>
-DETAILS:
-<xsl:apply-templates select="Node">
-  <xsl:sort select="Statistics/@state" order="descending"/>
-  <xsl:sort select="@name"/>
-</xsl:apply-templates>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/nodes-digest-html.xsl b/reports/xsl-transforms/nodes-digest-html.xsl
deleted file mode 100644
index 9585738c9..000000000
--- a/reports/xsl-transforms/nodes-digest-html.xsl
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0"?> 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml">
-    <xsl:include href="xsl-transform-includes/html-templates.xsl" />
-    <xsl:include href="xsl-transform-includes/main-js.xsl" />
-    <xsl:include href="xsl-transform-includes/boxypastel-css.xsl" />
-    <xsl:output method="xml" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-    <xsl:template match="Report">
-        <xsl:variable name="cleannodes" select="/Report/Node[count(Statistics/Good)>0]"/>
-        <xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
-        <xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
-        <xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
-        <xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
-        <xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
-    
-        <html>
-              <head>
-                    <title>
-                        <xsl:choose>
-                            <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">BCFG Nightly Errors (<xsl:value-of select="@name" />)</xsl:when>
-                            <xsl:otherwise>BCFG Nightly Errors (<xsl:value-of select="@name" />)</xsl:otherwise>
-                        </xsl:choose>
-                    </title>
-                    
-                    <xsl:copy-of select="$boxypastel-css" />
-                    <xsl:copy-of select="$main-js" />
-              </head>
-              <body bgcolor="#ffffff">
-                    <div class="header">
-                        <h1>
-                            <xsl:choose>
-                                <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">
-                                    BCFG Nightly Errors (<xsl:value-of select="@name" />)
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    BCFG Nightly Errors (<xsl:value-of select="@name" />)
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </h1><span class="notebox">Report Run @ <xsl:value-of select="@time" /></span>
-                    </div>
-                    <div class="nodebox">
-                        <h2>Summary:</h2>
-
-                        <p class="indented"><xsl:value-of select="count(/Report/Node)" /> Nodes were included in your report.</p>
-                        <xsl:if test="count(/Report/Node/Statistics/Good) > 0">
-                            <div class="clean">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('goodsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Good)" /></a> nodes are clean.<br /></span>
-                                <div class="items" id="goodsummary"><ul class="plain">                                    
-                                    
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Good) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-                            </div>
-                         </xsl:if>
-                         
-                         <xsl:if test="count(/Report/Node/Statistics/Bad) > 0">
-                            <div class="bad">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('badsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Bad)" /></a> nodes are bad.<br /></span>
-                                
-                                <div class="items" id="badsummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Bad) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-                            </div>
-                         </xsl:if>
-
-                         <xsl:if test="count(/Report/Node/Statistics/Extra) > 0">
-                            <div class="extra">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('extrasummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Extra)" /></a> nodes have extra configuration. (includes both good and bad nodes)<br /></span>
-                                <div class="items" id="extrasummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Extra) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-
-                            </div>
-                         </xsl:if>
-                        
-                        <xsl:if test="count(/Report/Node/Statistics/Modified) > 0">
-                            <div class="modified">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('modifiedsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Modified)" /></a> nodes were modified in the last run. (includes both good and bad nodes)<br /></span>
-                                
-                                <div class="items" id="modifiedsummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Modified) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-                            </div>
-                         </xsl:if>
-
-                        <xsl:if test="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)]) > 0">
-                            <div class="warning">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('vstalesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)])" /></a> nodes did not run within the last 24 hours but were pingable.<br /></span>
-                                <div class="items" id="vstalesummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-                            </div>
-                         </xsl:if>                            
-
-                        <xsl:if test="count(/Report/Node/Statistics/Stale) > 0">
-                            <div class="all-warning">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('stalesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Stale)" /></a> nodes did not run within the last 24 hours. (includes nodes up and down)<br /></span>
-                                
-                                <div class="items" id="stalesummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Stale) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-
-                            </div>
-                         </xsl:if>
-
-                        <xsl:if test="count(/Report/Node[HostInfo/@pingable='N']) > 0">
-                            <div class="down">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/HostInfo[@pingable='N'])" /></a> nodes were down.<br /></span>
-                                
-                                <div class="items" id="unpingablesummary"><ul class="plain">
-                                    <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(HostInfo[@pingable='N']) > 0">
-                                            <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
-                                        </xsl:if>
-                                    </xsl:for-each>
-                                </ul></div>
-                            </div>
-                        </xsl:if>
-
-
-
-
-                    </div>
-                    
-                    <xsl:apply-templates select="Node">
-                        <xsl:sort select="Statistics/@state" order="descending"/>
-                        <xsl:sort select="@name"/>
-                    </xsl:apply-templates>
-            <br/>
-            <br/>
-            <p>
-                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a>
-            </p>
-            </body>
-        </html>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/nodes-digest-mail.xsl b/reports/xsl-transforms/nodes-digest-mail.xsl
new file mode 100644
index 000000000..2aeea1ed4
--- /dev/null
+++ b/reports/xsl-transforms/nodes-digest-mail.xsl
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml">
+  <xsl:include href="xsl-transform-includes/text-templates.xsl" />
+  <xsl:output method="text" indent="no" media-type="text/plain" />
+  <xsl:template match="Report">
+    <xsl:choose>
+      <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">Subject: BCFG Nightly Errors (<xsl:value-of select="@name" />)
+    </xsl:when>
+    <xsl:otherwise>Subject: BCFG Nightly Good (<xsl:value-of select="@name" />)
+  </xsl:otherwise>
+</xsl:choose>
+<xsl:text>
+</xsl:text>Report Run @ <xsl:value-of select="@time" />
+
+SUMMARY:
+<xsl:text>    </xsl:text>
+<xsl:value-of select="count(/Report/Node)" /> nodes were included in your report.<xsl:text>
+</xsl:text>
+<xsl:if test="count(/Report/Node)-count(/Report/Node/Statistics/Good) = 0">
+  <xsl:text>    </xsl:text>All machines are configured to specification.
+</xsl:if><xsl:if test="count(/Report/Node/Statistics/Good) > 0">
+<xsl:text>    </xsl:text>
+<xsl:value-of select="count(/Report/Node/Statistics/Good)" /> nodes are clean.
+</xsl:if>
+<xsl:if test="count(/Report/Node/Statistics/Bad) > 0">
+  <xsl:text>    </xsl:text>
+  <xsl:value-of select="count(/Report/Node/Statistics/Bad)" /> nodes are bad.
+</xsl:if>
+<xsl:if test="count(/Report/Node/Statistics/Extra) > 0">
+  <xsl:text>    </xsl:text>
+  <xsl:value-of select="count(/Report/Node/Statistics/Extra)" /> nodes contain extra configuration. (includes both good and bad nodes)
+</xsl:if>
+<xsl:if test="count(/Report/Node/Statistics/Modified) > 0">
+  <xsl:text>    </xsl:text>
+  <xsl:value-of select="count(/Report/Node/Statistics/Modified)" /> nodes were modified in the last run. (includes both good and bad nodes)
+</xsl:if>
+<xsl:if test="count(/Report/Node/Statistics/Stale) > 0">
+  <xsl:text>    </xsl:text>
+  <xsl:value-of select="count(/Report/Node/Statistics/Stale)" /> nodes did not run within the last 24 hours.
+</xsl:if>
+DETAILS:
+<xsl:apply-templates select="Node">
+  <xsl:sort select="Statistics/@state" order="descending"/>
+  <xsl:sort select="@name"/>
+</xsl:apply-templates>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/nodes-digest-www.xsl b/reports/xsl-transforms/nodes-digest-www.xsl
new file mode 100644
index 000000000..9585738c9
--- /dev/null
+++ b/reports/xsl-transforms/nodes-digest-www.xsl
@@ -0,0 +1,174 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns="http://www.w3.org/1999/xhtml">
+    <xsl:include href="xsl-transform-includes/html-templates.xsl" />
+    <xsl:include href="xsl-transform-includes/main-js.xsl" />
+    <xsl:include href="xsl-transform-includes/boxypastel-css.xsl" />
+    <xsl:output method="xml" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+    <xsl:template match="Report">
+        <xsl:variable name="cleannodes" select="/Report/Node[count(Statistics/Good)>0]"/>
+        <xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
+        <xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
+        <xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
+        <xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
+        <xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
+    
+        <html>
+              <head>
+                    <title>
+                        <xsl:choose>
+                            <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">BCFG Nightly Errors (<xsl:value-of select="@name" />)</xsl:when>
+                            <xsl:otherwise>BCFG Nightly Errors (<xsl:value-of select="@name" />)</xsl:otherwise>
+                        </xsl:choose>
+                    </title>
+                    
+                    <xsl:copy-of select="$boxypastel-css" />
+                    <xsl:copy-of select="$main-js" />
+              </head>
+              <body bgcolor="#ffffff">
+                    <div class="header">
+                        <h1>
+                            <xsl:choose>
+                                <xsl:when test="count(/Report/Node/Statistics/Bad) > 0">
+                                    BCFG Nightly Errors (<xsl:value-of select="@name" />)
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    BCFG Nightly Errors (<xsl:value-of select="@name" />)
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </h1><span class="notebox">Report Run @ <xsl:value-of select="@time" /></span>
+                    </div>
+                    <div class="nodebox">
+                        <h2>Summary:</h2>
+
+                        <p class="indented"><xsl:value-of select="count(/Report/Node)" /> Nodes were included in your report.</p>
+                        <xsl:if test="count(/Report/Node/Statistics/Good) > 0">
+                            <div class="clean">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('goodsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Good)" /></a> nodes are clean.<br /></span>
+                                <div class="items" id="goodsummary"><ul class="plain">                                    
+                                    
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Good) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+                            </div>
+                         </xsl:if>
+                         
+                         <xsl:if test="count(/Report/Node/Statistics/Bad) > 0">
+                            <div class="bad">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('badsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Bad)" /></a> nodes are bad.<br /></span>
+                                
+                                <div class="items" id="badsummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Bad) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+                            </div>
+                         </xsl:if>
+
+                         <xsl:if test="count(/Report/Node/Statistics/Extra) > 0">
+                            <div class="extra">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('extrasummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Extra)" /></a> nodes have extra configuration. (includes both good and bad nodes)<br /></span>
+                                <div class="items" id="extrasummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Extra) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+
+                            </div>
+                         </xsl:if>
+                        
+                        <xsl:if test="count(/Report/Node/Statistics/Modified) > 0">
+                            <div class="modified">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('modifiedsummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Modified)" /></a> nodes were modified in the last run. (includes both good and bad nodes)<br /></span>
+                                
+                                <div class="items" id="modifiedsummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Modified) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+                            </div>
+                         </xsl:if>
+
+                        <xsl:if test="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)]) > 0">
+                            <div class="warning">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('vstalesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)])" /></a> nodes did not run within the last 24 hours but were pingable.<br /></span>
+                                <div class="items" id="vstalesummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+                            </div>
+                         </xsl:if>                            
+
+                        <xsl:if test="count(/Report/Node/Statistics/Stale) > 0">
+                            <div class="all-warning">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('stalesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Stale)" /></a> nodes did not run within the last 24 hours. (includes nodes up and down)<br /></span>
+                                
+                                <div class="items" id="stalesummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(Statistics/Stale) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+
+                            </div>
+                         </xsl:if>
+
+                        <xsl:if test="count(/Report/Node[HostInfo/@pingable='N']) > 0">
+                            <div class="down">
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/HostInfo[@pingable='N'])" /></a> nodes were down.<br /></span>
+                                
+                                <div class="items" id="unpingablesummary"><ul class="plain">
+                                    <xsl:for-each select="Node">
+                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:if test="count(HostInfo[@pingable='N']) > 0">
+                                            <li><b>Node: </b>
+                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                        </xsl:if>
+                                    </xsl:for-each>
+                                </ul></div>
+                            </div>
+                        </xsl:if>
+
+
+
+
+                    </div>
+                    
+                    <xsl:apply-templates select="Node">
+                        <xsl:sort select="Statistics/@state" order="descending"/>
+                        <xsl:sort select="@name"/>
+                    </xsl:apply-templates>
+            <br/>
+            <br/>
+            <p>
+                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a>
+            </p>
+            </body>
+        </html>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/nodes-individual-email.xsl b/reports/xsl-transforms/nodes-individual-email.xsl
deleted file mode 100644
index 0bc0ea848..000000000
--- a/reports/xsl-transforms/nodes-individual-email.xsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml">
-<xsl:include href="xsl-transform-includes/text-templates.xsl" />
-<xsl:output method="text" indent="no" media-type="text/plain" />
-<xsl:template match="Report">
-
-<xsl:choose>
-<xsl:when test="count(/Report/Node/Statistics/Bad) > 0">Subject: <xsl:value-of select="/Report/Node/@name" /> Nightly Errors
-</xsl:when>
-<xsl:when test="count(/Report/Node/Statistics/Good) > 0">Subject: <xsl:value-of select="/Report/Node/@name" /> Nightly Good</xsl:when>
-</xsl:choose>
-
-<xsl:if test="count(/Report/Node/Statistics/Good)+count(/Report/Node/Statistics/Bad) > 0">
-<xsl:text>
-</xsl:text>Report Run @ <xsl:value-of select="@time" />
-
-</xsl:if>
-<xsl:if test="count(/Report/Node/Statistics/Good) > 0">
-This node configured properly.
-</xsl:if>
-<xsl:apply-templates select="Node">
-<xsl:sort select="Statistics/@state" order="descending"/>
-<xsl:sort select="@name"/>
-</xsl:apply-templates>
-</xsl:template></xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/nodes-individual-mail.xsl b/reports/xsl-transforms/nodes-individual-mail.xsl
new file mode 100644
index 000000000..0bc0ea848
--- /dev/null
+++ b/reports/xsl-transforms/nodes-individual-mail.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml">
+<xsl:include href="xsl-transform-includes/text-templates.xsl" />
+<xsl:output method="text" indent="no" media-type="text/plain" />
+<xsl:template match="Report">
+
+<xsl:choose>
+<xsl:when test="count(/Report/Node/Statistics/Bad) > 0">Subject: <xsl:value-of select="/Report/Node/@name" /> Nightly Errors
+</xsl:when>
+<xsl:when test="count(/Report/Node/Statistics/Good) > 0">Subject: <xsl:value-of select="/Report/Node/@name" /> Nightly Good</xsl:when>
+</xsl:choose>
+
+<xsl:if test="count(/Report/Node/Statistics/Good)+count(/Report/Node/Statistics/Bad) > 0">
+<xsl:text>
+</xsl:text>Report Run @ <xsl:value-of select="@time" />
+
+</xsl:if>
+<xsl:if test="count(/Report/Node/Statistics/Good) > 0">
+This node configured properly.
+</xsl:if>
+<xsl:apply-templates select="Node">
+<xsl:sort select="Statistics/@state" order="descending"/>
+<xsl:sort select="@name"/>
+</xsl:apply-templates>
+</xsl:template></xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/timing-perf-html.xsl b/reports/xsl-transforms/timing-perf-html.xsl
deleted file mode 100644
index 838995243..000000000
--- a/reports/xsl-transforms/timing-perf-html.xsl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?> 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns="http://www.w3.org/1999/xhtml">
-    <xsl:include href="xsl-transform-includes/html-templates.xsl" />
-    <xsl:include href="xsl-transform-includes/main-js.xsl" />
-        <xsl:include href="xsl-transform-includes/sorttable-js.xsl" />
-    <xsl:include href="xsl-transform-includes/boxypastel-css.xsl" />    <xsl:output method="xml" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-    <xsl:template match="Report">
-        <html>
-              <head>
-                    <title>
-                        BCFG Performance Timings
-                    </title>
-                    
-                    <xsl:copy-of select="$boxypastel-css" />
-                    <xsl:copy-of select="$main-js" />
-                    <xsl:copy-of select="$sorttable-js" />
-
-              </head>
-              <body bgcolor="#ffffff">
-                    <div class="header">
-                        <h1>
-                            BCFG Performance Timings
-                        </h1><span class="notebox">Report Run @ <xsl:value-of select="@time" /></span>
-                    </div>
-                    <br/>                     
-                    <center> 
-                        <table id="t1" class="sortable">
-                            <tr>
-                                <th class="sortable">Hostname</th>
-                                <th class="sortable">Parse</th>
-                                <th class="sortable">Probe</th>
-                                <th class="sortable">Inventory</th>
-                                <th class="sortable">Install</th>
-                                <th class="sortable">Config</th>
-                                <th class="sortable">Total</th>
-                            </tr>                     
-                            <xsl:apply-templates select="Node">
-                                <xsl:sort select="HostInfo/@fqdn" order="ascending"/>
-                                <xsl:sort select="@name"/>
-                            </xsl:apply-templates>
-                        </table>
-                    </center>
-            <br/>
-            <br/>
-            <p>
-                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a>
-            </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    
-    <xsl:template match="Node">
-        <xsl:if test="count(Statistics/OpStamps) > 0">
-            <tr>
-                <td class="sortable"><xsl:value-of select="HostInfo/@fqdn" /></td><!--node name-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@config_parse - Statistics/OpStamps/@config_download),'#.##')"/></td><!--parse-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@probe_upload - Statistics/OpStamps/@start),'#.##')"/></td><!--probe download-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@inventory - Statistics/OpStamps/@initialization),'#.##')"/></td><!--inventory-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@install - Statistics/OpStamps/@inventory),'#.##')"/></td><!--install-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@config_parse - Statistics/OpStamps/@probe_upload),'#.##')"/></td><!--config download & parse-->
-                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@finished - Statistics/OpStamps/@start),'#.##')"/></td><!--Total-->
-            </tr>
-        </xsl:if>
-    </xsl:template>
-    
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/timing-summary-www.xsl b/reports/xsl-transforms/timing-summary-www.xsl
new file mode 100644
index 000000000..838995243
--- /dev/null
+++ b/reports/xsl-transforms/timing-summary-www.xsl
@@ -0,0 +1,68 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns="http://www.w3.org/1999/xhtml">
+    <xsl:include href="xsl-transform-includes/html-templates.xsl" />
+    <xsl:include href="xsl-transform-includes/main-js.xsl" />
+        <xsl:include href="xsl-transform-includes/sorttable-js.xsl" />
+    <xsl:include href="xsl-transform-includes/boxypastel-css.xsl" />    <xsl:output method="xml" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+    <xsl:template match="Report">
+        <html>
+              <head>
+                    <title>
+                        BCFG Performance Timings
+                    </title>
+                    
+                    <xsl:copy-of select="$boxypastel-css" />
+                    <xsl:copy-of select="$main-js" />
+                    <xsl:copy-of select="$sorttable-js" />
+
+              </head>
+              <body bgcolor="#ffffff">
+                    <div class="header">
+                        <h1>
+                            BCFG Performance Timings
+                        </h1><span class="notebox">Report Run @ <xsl:value-of select="@time" /></span>
+                    </div>
+                    <br/>                     
+                    <center> 
+                        <table id="t1" class="sortable">
+                            <tr>
+                                <th class="sortable">Hostname</th>
+                                <th class="sortable">Parse</th>
+                                <th class="sortable">Probe</th>
+                                <th class="sortable">Inventory</th>
+                                <th class="sortable">Install</th>
+                                <th class="sortable">Config</th>
+                                <th class="sortable">Total</th>
+                            </tr>                     
+                            <xsl:apply-templates select="Node">
+                                <xsl:sort select="HostInfo/@fqdn" order="ascending"/>
+                                <xsl:sort select="@name"/>
+                            </xsl:apply-templates>
+                        </table>
+                    </center>
+            <br/>
+            <br/>
+            <p>
+                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a>
+            </p>
+            </body>
+        </html>
+    </xsl:template>
+    
+    
+    <xsl:template match="Node">
+        <xsl:if test="count(Statistics/OpStamps) > 0">
+            <tr>
+                <td class="sortable"><xsl:value-of select="HostInfo/@fqdn" /></td><!--node name-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@config_parse - Statistics/OpStamps/@config_download),'#.##')"/></td><!--parse-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@probe_upload - Statistics/OpStamps/@start),'#.##')"/></td><!--probe download-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@inventory - Statistics/OpStamps/@initialization),'#.##')"/></td><!--inventory-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@install - Statistics/OpStamps/@inventory),'#.##')"/></td><!--install-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@config_parse - Statistics/OpStamps/@probe_upload),'#.##')"/></td><!--config download & parse-->
+                <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@finished - Statistics/OpStamps/@start),'#.##')"/></td><!--Total-->
+            </tr>
+        </xsl:if>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/sbin/StatReports b/src/sbin/StatReports
index c0321d23c..fd26d703f 100644
--- a/src/sbin/StatReports
+++ b/src/sbin/StatReports
@@ -233,34 +233,18 @@ if __name__ == '__main__':
             #is a deepcopy of procnodereport necessary?
             
             delivtype = deliv.get('type', default='nodes-digest')
-            deliverymechanism = deliv.get('mechanism', default='invalid')
+            deliverymechanism = deliv.get('mechanism', default='www')
 
             #apply XSLT, different ones based on report type, and options
-            transform = ''
-            if deliverymechanism == 'mail':
-                if delivtype == 'nodes-individual':
-                    transform = 'nodes-individual-email.xsl'                    
-                elif delivtype == 'overview-stats':
-                    transform = 'overview-stats-email.xsl'
-                else:
-                    transform = 'nodes-digest-email.xsl'
-            elif deliverymechanism == 'rss':
-                if delivtype == 'overview-stats':
-                    transform = 'overview-stats-rss.xsl'
-                else:
-                    transform = 'nodes-digest-rss.xsl'
-            elif deliverymechanism == 'www':
-                if delivtype == 'overview-stats':
-                    transform = 'overview-stats-html.xsl'
-                elif delivtype == 'times':
-                    transform = 'timing-perf-html.xsl'
-                else:
-                    transform = 'nodes-digest-html.xsl'
-            elif deliverymechanism == 'null-operator':
+            if deliverymechanism == 'null-operator':
                 fileout(tostring(ElementTree(procnodereport).getroot()),deliv)
                 break
-            else:
-                print("StatReports: Invalid delivery mechanism in report-config")
+            transform = delivtype + '-' + deliverymechanism + '.xsl'
+            try:
+                os.stat(transformpath + transform)
+            except:
+                print("StatReports: Invalid report type or delivery mechanism.\n Can't find: "\
+                      + transformpath + transform)
                 raise SystemExit, 1
 
             try:
-- 
cgit v1.2.3-1-g7c22