[Erp5-report] r16856 - /erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Oct  5 13:40:22 2007
New Revision: 16856

URL: http://svn.erp5.org?rev=16856&view=rev
Log:
Follow upgrading of ERP5Diff, keep compatibility for older revision

Modified:
    erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py

Modified: erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py?rev=16856&r1=16855&r2=16856&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py (original)
+++ erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py Fri Oct  5 13:40:22 2007
@@ -449,15 +449,19 @@
     """
     erp5diff = ERP5Diff()
     erp5diff.compare(old_xml, object_xml)
-    xupdate_doc = erp5diff._result
-    #minidom is buggy, add namespace declaration, and version
-    attr_ns = xupdate_doc.createAttribute('xmlns:xupdate')
-    attr_ns.value = 'http://www.xmldb.org/xupdate'
-    attr_version = xupdate_doc.createAttribute('version')
-    attr_version.value = '1.0'
-    xupdate_doc.documentElement.setAttributeNode(attr_ns)
-    xupdate_doc.documentElement.setAttributeNode(attr_version)
-    xupdate = xupdate_doc.toxml('utf-8')
+    #minidom is buggy, add namespace declaration, and version, only if attribute version doesn't exists
+    ns = 'http://www.xmldb.org/xupdate'
+    if not erp5diff._result.documentElement.hasAttributeNS(ns, 'version'):
+      attr_version = erp5diff._result.createAttributeNS(ns, 'version')
+      attr_version.value = '1.0'
+      erp5diff._result.documentElement.setAttributeNodeNS(attr_version)
+      attr_ns = erp5diff._result.createAttributeNS(ns, 'xmlns:xupdate')
+      attr_ns.value = ns
+      erp5diff._result.documentElement.setAttributeNodeNS(attr_ns)
+      xupdate = erp5diff._result.toxml('utf-8')
+    else:
+      #Upper version of ERP5Diff produce valid XML.
+      xupdate = erp5diff.outputString()
     #omit xml declaration
     xupdate = xupdate[xupdate.find('<xupdate:modifications'):]
     return xupdate