commit f742d3417905e5a0f4785f9684c3a7427e139ca7
author Daniel Veillard <veillard@src.gnome.org> Thu Mar 07 00:05:35 2002 +0000
committer Daniel Veillard <veillard@src.gnome.org> Thu Mar 07 00:05:35 2002 +0000
tree 524469b1b576ec335c472ebf6a9933a9535b9cf5
parent 4e0e29746889d4a70728e6406eed2f546287bdd6

fixed xmlReconciliateNs(), added a Python test/example for inter-document

* tree.c python/tests/Makefile.am python/tests/cutnpaste.py:
  fixed xmlReconciliateNs(), added a Python test/example for
  inter-document cut'n paste
* python/libxml.py: fixed node.doc on document nodes and added
  xpathEval() onto node objects
Daniel

tree.c

diff --git a/tree.c b/tree.c
index 3bd3456..3764f0e 100644
--- a/tree.c
+++ b/tree.c
@@ -4515,11 +4515,18 @@
      * Find a close prefix which is not already in use.
      * Let's strip namespace prefixes longer than 20 chars !
      */
-    sprintf((char *) prefix, "%.20s", ns->prefix);
+    if (ns->prefix == NULL)
+	sprintf((char *) prefix, "default");
+    else
+	sprintf((char *) prefix, "%.20s", ns->prefix);
+
     def = xmlSearchNs(doc, tree, prefix);
     while (def != NULL) {
         if (counter > 1000) return(NULL);
-        sprintf((char *) prefix, "%.20s%d", ns->prefix, counter++);
+	if (ns->prefix == NULL)
+	    sprintf((char *) prefix, "default%d", counter++);
+	else
+	    sprintf((char *) prefix, "%.20s%d", ns->prefix, counter++);
 	def = xmlSearchNs(doc, tree, prefix);
     }
 
@@ -4721,6 +4728,10 @@
 	} else
 	    break;
     }
+    if (oldNs != NULL)
+	xmlFree(oldNs);
+    if (newNs != NULL)
+	xmlFree(newNs);
     return(ret);
 }