diff options
| -rw-r--r-- | reports/xsl-transforms/nodes-digest-mail.xsl (renamed from reports/xsl-transforms/nodes-digest-email.xsl) | 0 | ||||
| -rw-r--r-- | reports/xsl-transforms/nodes-digest-www.xsl (renamed from reports/xsl-transforms/nodes-digest-html.xsl) | 0 | ||||
| -rw-r--r-- | reports/xsl-transforms/nodes-individual-mail.xsl (renamed from reports/xsl-transforms/nodes-individual-email.xsl) | 0 | ||||
| -rw-r--r-- | reports/xsl-transforms/timing-summary-www.xsl (renamed from reports/xsl-transforms/timing-perf-html.xsl) | 0 | ||||
| -rw-r--r-- | src/sbin/StatReports | 32 |
5 files changed, 8 insertions, 24 deletions
diff --git a/reports/xsl-transforms/nodes-digest-email.xsl b/reports/xsl-transforms/nodes-digest-mail.xsl index 2aeea1ed4..2aeea1ed4 100644 --- a/reports/xsl-transforms/nodes-digest-email.xsl +++ b/reports/xsl-transforms/nodes-digest-mail.xsl diff --git a/reports/xsl-transforms/nodes-digest-html.xsl b/reports/xsl-transforms/nodes-digest-www.xsl index 9585738c9..9585738c9 100644 --- a/reports/xsl-transforms/nodes-digest-html.xsl +++ b/reports/xsl-transforms/nodes-digest-www.xsl diff --git a/reports/xsl-transforms/nodes-individual-email.xsl b/reports/xsl-transforms/nodes-individual-mail.xsl index 0bc0ea848..0bc0ea848 100644 --- a/reports/xsl-transforms/nodes-individual-email.xsl +++ b/reports/xsl-transforms/nodes-individual-mail.xsl diff --git a/reports/xsl-transforms/timing-perf-html.xsl b/reports/xsl-transforms/timing-summary-www.xsl index 838995243..838995243 100644 --- a/reports/xsl-transforms/timing-perf-html.xsl +++ b/reports/xsl-transforms/timing-summary-www.xsl 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: |