From d4469be76426ccedba2bdd591ee38b5742266a21 Mon Sep 17 00:00:00 2001 From: Joey Hagedorn 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: -.xsl git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1631 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/StatReports | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'src/sbin/StatReports') 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