From cf87011edb2e2c55e22c3d8732e0ab9e4211c005 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 29 Nov 2005 20:00:54 +0000 Subject: fix email (non-xml) formatted reports (Logical change 1.372) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1569 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/StatReports | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/sbin/StatReports b/src/sbin/StatReports index 75409af9a..c0321d23c 100644 --- a/src/sbin/StatReports +++ b/src/sbin/StatReports @@ -263,13 +263,8 @@ if __name__ == '__main__': print("StatReports: Invalid delivery mechanism in report-config") raise SystemExit, 1 - - #IMPORTANT to add some error checking here-parseerrors - #this might be sufficient try: stylesheet = XSLT(parse(transformpath + transform)) - #styledoc = libxml2.parseFile(transformpath+transform) - #style = libxslt.parseStylesheetDoc(styledoc) except: print("StatReports: invalid XSLT transform file.") raise SystemExit, 1 @@ -281,8 +276,10 @@ if __name__ == '__main__': [reportdata.remove(y) for y in reportdata.findall("Node")] reportdata.append(noden) else: - reportdata = procnodereport - outputstring = tostring(stylesheet.apply(reportdata).getroot()) + reportdata = deepcopy(procnodereport) + + result = stylesheet.apply(ElementTree(reportdata)) + outputstring = stylesheet.tostring(result) if not outputstring == None: toastring = '' -- cgit v1.2.3-1-g7c22