[Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.p ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-31 13:16:30

Modified files:
	luci/site/luci/Extensions: ricci_bridge.py ricci_communicator.py 

Log message:
	make getElementsByTagName work for the XML fragments we get from ricci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_communicator.py.diff?cvsroot=cluster&r1=1.14&r2=1.15

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/10/30 21:21:17	1.37
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/10/31 13:16:30	1.38
@@ -218,7 +218,7 @@
 		try:
 			batch_number = i.getAttribute('batch_id')
 			result = i.getAttribute('status')
-			return (batch_number, result)
+			return (str(batch_number), str(result))
 		except Exception, e:
 			luci_log.debug_verbose('batchAttemptResult: %s' % str(e))
 
--- conga/luci/site/luci/Extensions/ricci_communicator.py	2006/10/20 22:29:22	1.14
+++ conga/luci/site/luci/Extensions/ricci_communicator.py	2006/10/31 13:16:30	1.15
@@ -216,7 +216,9 @@
             luci_log.debug('An error occurred while trying to process the batch job: %s' % batch_xml_str)
             return None
 
-        return ricci_xml
+        doc = minidom.Document()
+        doc.appendChild(ricci_xml)
+        return doc
 
     def batch_report(self, batch_id):
         luci_log.debug_verbose('[auth=%d] asking for batchid# %d for host %s' \