mirror/libxml2
2
0
Fork 0
mirror of https://github.com/GNOME/libxml2.git synced 2025-03-13 18:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing namespace DTD validations the output of defaulted namespaces is

Browse Source 
* SAX2.c: fixing namespace DTD validations
* result/valid/ns2.xml result/valid/ns.xml: the output of defaulted
  namespaces is slightly different now.
* Makefile.am: report the memory used in Timingtests (as well as time)
Daniel
This commit is contained in:
Daniel Veillard 2003-09-18 22:03:46 +00:00
parent 4ac494b8f4
commit d9e9c9d8f3
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Sep 19 00:01:08 CEST 2003 Daniel Veillard <daniel@veillard.com>
* SAX2.c: fixing namespace DTD validations
* result/valid/ns2.xml result/valid/ns.xml: the output of defaulted
namespaces is slightly different now.
* Makefile.am: report the memory used in Timingtests (as well as time)
Thu Sep 18 15:29:46 CEST 2003 Daniel Veillard <daniel@veillard.com>
* Makefile.am: add streaming on memory regression tests, found

4
Makefile.am
View File

@ -728,9 +728,13 @@ Timingtests: $(srcdir)/dba100000.xml
@echo "## then when using the memory interface"
@echo "##"
-@(xmllint --stream --timing $(srcdir)/dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
exit 0)
-@(xmllint --stream --timing --memory $(srcdir)/dba100000.xml; \
MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
exit 0)

13
SAX2.c
View File

@ -1922,6 +1922,10 @@ xmlSAX2StartElementNs(void *ctx,
return;
}
}
if (ctxt->linenumbers) {
if (ctxt->input != NULL)
ret->content = (void *) (long) ctxt->input->line;
}
if (ctxt->myDoc->children == NULL) {
xmlAddChild((xmlNodePtr) ctxt->myDoc, (xmlNodePtr) ret);
@ -1950,12 +1954,13 @@ xmlSAX2StartElementNs(void *ctx,
ctxt->disableSAX = 1;
return;
}
if ((!ctxt->html) && ctxt->validate && ctxt->wellFormed &&
ctxt->myDoc && ctxt->myDoc->intSubset) {
ctxt->valid &= xmlValidateOneNamespace(&ctxt->vctxt, ctxt->myDoc,
ret, prefix, ns, uri);
}
}
ctxt->nodemem = -1;
if (ctxt->linenumbers) {
if (ctxt->input != NULL)
ret->content = (void *) (long) ctxt->input->line;
}
/*
* We are parsing a new node.

2
result/valid/ns.xml
View File

@ -4,4 +4,4 @@
<!ATTLIST a:outer xmlns:a CDATA #FIXED "urn:namespace">
<!ATTLIST a:outer xmlns:b CDATA #FIXED "urn:namespaceb">
]>
<a:outer xmlns:b="urn:namespaceb" xmlns:a="urn:namespace"/>
<a:outer xmlns:a="urn:namespace" xmlns:b="urn:namespaceb"/>

2
result/valid/ns2.xml
View File

@ -7,5 +7,5 @@
<!ATTLIST a:inner attr CDATA #FIXED "yes">
]>
<a:outer xmlns:a="urn:namespace">
<a:inner xmlns:a="urn:namespace"/>
<a:inner/>
</a:outer>