[Erp5-report] r30182 - /erp5/trunk/utils/erp5diff/ERP5Diff.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Oct 30 18:53:07 2009
New Revision: 30182

URL: http://svn.erp5.org?rev=30182&view=rev
Log:
Root element was missing in generated Xpath expressions

Modified:
    erp5/trunk/utils/erp5diff/ERP5Diff.py

Modified: erp5/trunk/utils/erp5diff/ERP5Diff.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5diff/ERP5Diff.py?rev=30182&r1=30181&r2=30182&view=diff
==============================================================================
--- erp5/trunk/utils/erp5diff/ERP5Diff.py [utf8] (original)
+++ erp5/trunk/utils/erp5diff/ERP5Diff.py [utf8] Fri Oct 30 18:53:07 2009
@@ -67,7 +67,7 @@
   # Declarative interfaces
   zope.interface.implements(IERP5Diff,)
 
-  __version__ = 0.5
+  __version__ = 0.6
 
   def __init__(self):
     """
@@ -511,14 +511,16 @@
       self._result = etree.Element('{%s}modifications' % self._ns, nsmap={'xupdate':self._ns})
       self._result.set('version', '1.0')
       if self._testElements(old_root_element, new_root_element):
-        self._testAttributes(old_root_element, new_root_element, '/')
-        self._compareChildNodes(old_root_element, new_root_element, '/')
+        qname = old_root_element.xpath('name()')
+        self._testAttributes(old_root_element, new_root_element, '/%s' % qname)
+        self._compareChildNodes(old_root_element, new_root_element, '/%s' % qname)
       else:
         # These XML documents seem to be completely different...
         if old_root_element.tag != new_root_element.tag:
-          self._xupdateRenameElement(new_root_element.tag, '/')
-        self._testAttributes(old_root_element, new_root_element, '/')
-        self._xupdateUpdateElement(new_root_element, '/')
+          self._xupdateRenameElement(new_root_element.xpath('name()'), '/%s' % old_root_element.xpath('name()'))
+        qname = new_root_element.xpath('name()')
+        self._testAttributes(old_root_element, new_root_element, '/%s' % qname)
+        self._compareChildNodes(old_root_element, new_root_element, '/%s' % qname)
     finally:
       del old_doc
       del new_doc