Reinstate own_clone_node. All php5 tests pass!

[xml-template] / python / xmltemplate.py

diff --git a/python/xmltemplate.py b/python/xmltemplate.py
index 19531496f7d08af8d76df86c515c63cb1dcfe337..16225926876eef7dc95791a7c40401af6681b707 100644 (file)
--- a/python/xmltemplate.py
+++ b/python/xmltemplate.py
@@ -36,7 +36,7 @@ def process(node, obj, clean = True):
                                if not attrs is None:
                                        for i in range(attrs.length):
                                                attr = attrs.item(0)
-                                               if attr.namespaceURI == "http://template.sesse.net/" or attr.name == "id":
+                                               if attr.namespaceURI == "http://template.sesse.net/" and attr.localName == "id":
                                                        id = attr.value
                                                        if clean:
                                                                attrs_to_remove.append(attr.name)
@@ -73,11 +73,12 @@ def process(node, obj, clean = True):
                        frag.appendChild(child)
 
                for instance in obj:
-                       newnode = frag.cloneNode(True)
-                       node.appendChild(newnode)
-                       process(newnode, instance, clean)
-                       if clean:
-                               _clean(newnode)
+                       if instance is not None:
+                               newnode = frag.cloneNode(True)
+                               node.appendChild(newnode)
+                               process(newnode, instance, clean)
+                               if clean:
+                                       _clean(newnode)
 
                # remove all the <fragment> tags
 
@@ -99,8 +100,9 @@ def process(node, obj, clean = True):
 def alternate(tag, array, *elems):
        i = 0
        for ref in array:
-               ref[tag] = elems[i % len(elems)]
-               i = i + 1
+               if ref is not None:
+                       ref[tag] = elems[i % len(elems)]
+                       i = i + 1
                
        return array