From f58ef048b910be2927d2e7e19182c945c7753b67 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Wed, 12 Aug 2009 08:20:45 +0000 Subject: Make the failed 5 testcases passed in DOMTS Core level2. svn path=/trunk/dom/; revision=9211 --- src/core/document.c | 2 +- src/core/element.c | 3 +++ src/utils/namespace.c | 7 +++++++ test/testutils/load.c | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/core/document.c b/src/core/document.c index 7d7e64a..6bd0045 100644 --- a/src/core/document.c +++ b/src/core/document.c @@ -1520,7 +1520,7 @@ dom_exception _dom_find_element_by_id(dom_node_internal *root, dom_node_internal *node = root; while (node != NULL) { - if (root->type == DOM_ELEMENT_NODE) { + if (node->type == DOM_ELEMENT_NODE) { lwc_string *real_id; _dom_element_get_id((dom_element *) node, &real_id); if (real_id == id) { diff --git a/src/core/element.c b/src/core/element.c index 11c7f5e..54bb9d1 100644 --- a/src/core/element.c +++ b/src/core/element.c @@ -1190,6 +1190,9 @@ dom_exception _dom_element_copy(struct dom_node_internal *new, return DOM_NO_MEM_ERR; ne->ns_attributes = ht; + ne->id_ns = NULL; + ne->id_name = NULL; + /* TODO: deal with dom_type_info, it get no definition ! */ return DOM_NO_ERR; diff --git a/src/utils/namespace.c b/src/utils/namespace.c index 8d109ae..3290b3f 100644 --- a/src/utils/namespace.c +++ b/src/utils/namespace.c @@ -158,6 +158,13 @@ dom_exception _dom_namespace_validate_qname(struct dom_string *qname, dom_string_cmp(qname, xmlns) != 0) { return DOM_NAMESPACE_ERR; } + /* If qname == "xmlns", ensure namespace URI is for xmlns */ + if (namespace != NULL && + dom_string_cmp(qname, xmlns) == 0 && + dom_string_cmp(namespace, + dom_namespaces[DOM_NAMESPACE_XMLNS]) != 0) { + return DOM_NAMESPACE_ERR; + } } else if (colon == 0) { /* Some name like ":name" */ if (namespace != NULL) diff --git a/test/testutils/load.c b/test/testutils/load.c index 74cc009..66e4e4c 100644 --- a/test/testutils/load.c +++ b/test/testutils/load.c @@ -108,7 +108,7 @@ dom_document *load_html(char *file, bool willBeModified) parser = dom_hubbub_parser_create("data/Aliases", NULL, true, myrealloc, NULL, mymsg, NULL, ctx); if (parser == NULL) { - fprintf(stderr, "Can't create XMLParser\n"); + fprintf(stderr, "Can't create Hubbub Parser\n"); return NULL; } -- cgit v1.2.3