Commit ba70cc0d authored by Kasimier T. Buchcik's avatar Kasimier T. Buchcik

Changed xmlSearchNsByHref to call xmlNsInScope with the prefix instead of

* tree.c: Changed xmlSearchNsByHref to call xmlNsInScope with
  the prefix instead of the namespace name.
* test/schemas/annot-err_0.xsd test/schemas/element-err_0.xsd:
  Adapted invalid values of the "id" attribute, since they are
  validated now.
parent 36616dd2
Mon Feb 28 11:18:24 CET 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
* tree.c: Changed xmlSearchNsByHref to call xmlNsInScope with
the prefix instead of the namespace name.
* test/schemas/annot-err_0.xsd test/schemas/element-err_0.xsd:
Adapted invalid values of the "id" attribute, since they are
validated now.
Fri Feb 25 08:31:16 CET 2005 Daniel Veillard <daniel@veillard.com>
* threads.c: new version with fixes from Rob Richards
......
......@@ -4,13 +4,13 @@
xmlns:goo="http://GOO"
xmlns:but="http://BUT">
<xsd:element name="foo" xml:lang="hhh">
<xsd:annotation id="?" death="is a good entertainer" but:such="is life">
<xsd:annotation id="id1" death="is a good entertainer" but:such="is life">
I shouldn't do this here...
<xsd:appinfo id="?" source="somewhere"
<xsd:appinfo id="id2" source="somewhere"
goo:fun="bag" fun="another fun-bag">
weeelll
</xsd:appinfo>
<xsd:documentation xml:lang="*" id="?" source="anywhere"
<xsd:documentation xml:lang="*" id="id3" source="anywhere"
goo:mothers="of invention" mothers="don't do your dishes">
hmmmmmm
</xsd:documentation>
......@@ -18,4 +18,4 @@
</xsd:annotation>
</xsd:element>
</xsd:schema>
\ No newline at end of file
</xsd:schema>
......@@ -17,7 +17,7 @@
<xsd:sequence>
<xsd:element ref="foo:bar" name="myomy" minOccurs="3"
maxOccurs="2" abstract="true" block="flute"
form="qualified" id="b12" nillable="true"
form="qualified" id="b13" nillable="true"
substitutionGroup="foo:bar" type="xsd:string"
default="Jimi" fixed="Hendrix" final="fantasy">
<xsd:complexType/>
......@@ -25,7 +25,7 @@
</xsd:element>
<xsd:element name="myomy" maxOccurs="0"
abstract="true" block="flute"
form="qualified" id="b12" nillable="true"
form="qualified" id="b14" nillable="true"
substitutionGroup="foo:bar" type="xsd:string"
default="Jimi" fixed="Hendrix" final="fantasy">
<xsd:complexType/>
......
......@@ -5671,7 +5671,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
if ((cur->href != NULL) && (href != NULL) &&
(xmlStrEqual(cur->href, href))) {
if (((!is_attr) || (cur->prefix != NULL)) &&
(xmlNsInScope(doc, orig, node, cur->href) == 1))
(xmlNsInScope(doc, orig, node, cur->prefix) == 1))
return (cur);
}
cur = cur->next;
......@@ -5682,7 +5682,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
if ((cur->href != NULL) && (href != NULL) &&
(xmlStrEqual(cur->href, href))) {
if (((!is_attr) || (cur->prefix != NULL)) &&
(xmlNsInScope(doc, orig, node, cur->href) == 1))
(xmlNsInScope(doc, orig, node, cur->prefix) == 1))
return (cur);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment