Refactor collection of text and comments nodes

diff --git a/xml-ANNOUNCE b/xml-ANNOUNCE
index 876a6dbb461eb011b0c5e10f30cdfa35a5d13865..bdd1bd724a760ef3a1c8adf5e0b343328518c7ea 100644 (file)
--- a/xml-ANNOUNCE
+++ b/xml-ANNOUNCE
@@ -5,6 +5,9 @@ WHAT IS IT
    View an XML file in Midnight Commander as a filesystem.
 
 
+WHAT'S NEW in version 0.3.2 (2013-11-19)
+   Refactored collection of text and comments nodes.
+
 WHAT'S NEW in version 0.3.1 (2013-11-18)
    Fixed a bug in directories permissions.
 

diff --git a/xml-minidom b/xml-minidom
index 9dbfac63fa5f04e20ec224ab5c66cb9e0e0a28a8..26d5d862343d6d17e804d919a0c317614ce0cf66 100755 (executable)
--- a/xml-minidom
+++ b/xml-minidom
@@ -32,7 +32,7 @@ The VFS was inspired by a FUSE xmlfs: https://github.com/halhen/xmlfs
 
 """
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2013 PhiloSoft Design"
 __license__ = "GPL"
@@ -134,12 +134,11 @@ def _list(node, path=''):
                 attr_text = _attrs2text(attrs)
                 print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/attributes" % (
                     len(attr_text), subpath_encoded)
+            text = _collect_text(element)
+            if text:
+                print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/text" % (
+                    len(text), subpath_encoded)
             _list(element, subpath)
-    if path:
-        text = _collect_text(node)
-        if text:
-            print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/text" % (
-                len(text), path.encode(default_encoding, "replace"))
 
 def mcxml_list():
     """List the entire VFS"""