From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 31 Jul 2006 21:18:37 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py
Message-ID: <20060731211837.6905.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-31 21:18:36

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

Log message:
	setClusterConf fix

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/31 18:55:00	1.12
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/31 21:18:35	1.13
@@ -509,7 +509,11 @@
     else:
       propg = "False"
 
-    QUERY_STR='<?xml version="1.0" ?><ricci async="true" function="process_batch" version="1.0"><batch><module name="cluster"><request API_version="1.0"><function_call name="set_cluster.conf"/><var type="boolean" mutable="false" value="' + propg + '"/><var type="xml" mutable="false" name="cluster.conf"/>' + str(clusterconf) + </request></module></batch></ricci>'
+    conf = str(clusterconf).replace('<?xml version="1.0"?>', '')
+    conf = conf.replace('<?xml version="1.0" ?>', '')
+    conf = conf.replace('<? xml version="1.0"?>', '')
+    conf = conf.replace('<? xml version="1.0" ?>', '')
+    QUERY_STR='<?xml version="1.0" ?><ricci async="true" function="process_batch" version="1.0"><batch><module name="cluster"><request API_version="1.0"><function_call name="set_cluster.conf"><var type="boolean" name="propagate" mutable="false" value="' + propg + '"/><var type="xml" mutable="false" name="cluster.conf">' + conf + '</var></function_call></request></module></batch></ricci>'
 
     try:
       payload = self.makeConnection(QUERY_STR)