c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed xmlSearchNsByHref to call xmlNsInScope with the prefix instead of

Browse Source 
* 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.
This commit is contained in:
Kasimier T. Buchcik 2005-02-28 10:28:21 +00:00
parent 36616dd245
commit ba70cc0de7
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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> Fri Feb 25 08:31:16 CET 2005 Daniel Veillard <daniel@veillard.com>
* threads.c: new version with fixes from Rob Richards * threads.c: new version with fixes from Rob Richards

8
test/schemas/annot-err_0.xsd
View File

@ -4,13 +4,13 @@
xmlns:goo="http://GOO" xmlns:goo="http://GOO"
xmlns:but="http://BUT"> xmlns:but="http://BUT">
<xsd:element name="foo" xml:lang="hhh"> <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... I shouldn't do this here...
<xsd:appinfo id="?" source="somewhere" <xsd:appinfo id="id2" source="somewhere"
goo:fun="bag" fun="another fun-bag"> goo:fun="bag" fun="another fun-bag">
weeelll weeelll
</xsd:appinfo> </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"> goo:mothers="of invention" mothers="don't do your dishes">
hmmmmmm hmmmmmm
</xsd:documentation> </xsd:documentation>
@ -18,4 +18,4 @@
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>

4
test/schemas/element-err_0.xsd
View File

@ -17,7 +17,7 @@
<xsd:sequence> <xsd:sequence>
<xsd:element ref="foo:bar" name="myomy" minOccurs="3" <xsd:element ref="foo:bar" name="myomy" minOccurs="3"
maxOccurs="2" abstract="true" block="flute" maxOccurs="2" abstract="true" block="flute"
form="qualified" id="b12" nillable="true" form="qualified" id="b13" nillable="true"
substitutionGroup="foo:bar" type="xsd:string" substitutionGroup="foo:bar" type="xsd:string"
default="Jimi" fixed="Hendrix" final="fantasy"> default="Jimi" fixed="Hendrix" final="fantasy">
<xsd:complexType/> <xsd:complexType/>
@ -25,7 +25,7 @@
</xsd:element> </xsd:element>
<xsd:element name="myomy" maxOccurs="0" <xsd:element name="myomy" maxOccurs="0"
abstract="true" block="flute" abstract="true" block="flute"
form="qualified" id="b12" nillable="true" form="qualified" id="b14" nillable="true"
substitutionGroup="foo:bar" type="xsd:string" substitutionGroup="foo:bar" type="xsd:string"
default="Jimi" fixed="Hendrix" final="fantasy"> default="Jimi" fixed="Hendrix" final="fantasy">
<xsd:complexType/> <xsd:complexType/>

4
tree.c
View File

@ -5671,7 +5671,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
if ((cur->href != NULL) && (href != NULL) && if ((cur->href != NULL) && (href != NULL) &&
(xmlStrEqual(cur->href, href))) { (xmlStrEqual(cur->href, href))) {
if (((!is_attr) || (cur->prefix != NULL)) && if (((!is_attr) || (cur->prefix != NULL)) &&
(xmlNsInScope(doc, orig, node, cur->href) == 1)) (xmlNsInScope(doc, orig, node, cur->prefix) == 1))
return (cur); return (cur);
} }
cur = cur->next; cur = cur->next;
@ -5682,7 +5682,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href)
if ((cur->href != NULL) && (href != NULL) && if ((cur->href != NULL) && (href != NULL) &&
(xmlStrEqual(cur->href, href))) { (xmlStrEqual(cur->href, href))) {
if (((!is_attr) || (cur->prefix != NULL)) && if (((!is_attr) || (cur->prefix != NULL)) &&
(xmlNsInScope(doc, orig, node, cur->href) == 1)) (xmlNsInScope(doc, orig, node, cur->prefix) == 1))
return (cur); return (cur);
} }
} }