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

fixed nextCatalog started adding a small regression test Daniel

Browse Source 
* catalog.c: fixed nextCatalog
* result/catalogs/docbook test/catalogs/*: started adding
  a small regression test
Daniel
This commit is contained in:
Daniel Veillard 2001-08-21 12:57:59 +00:00
parent cda969218b
commit 6433954692
6 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Aug 21 14:56:18 CEST 2001 Daniel Veillard <daniel@veillard.com>
* catalog.c: fixed nextCatalog
* result/catalogs/docbook test/catalogs/*: started adding
a small regression test
Tue Aug 21 12:52:38 CEST 2001 Daniel Veillard <daniel@veillard.com>
* Makefile.am catalog.c xmlcatalog.c include/libxml/catalog.h:

4
catalog.c
View File

@ -1018,7 +1018,9 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
xmlFetchXMLCatalogFile(cur);
}
if (cur->children != NULL) {
xmlCatalogListXMLResolve(cur->children, pubID, sysID);
ret = xmlCatalogListXMLResolve(cur->children, pubID, sysID);
if (ret != NULL)
return(ret);
}
}
cur = cur->next;

4
result/catalogs/docbook Normal file
View File

@ -0,0 +1,4 @@
> /usr/share/xml/docbook/xml/4.1.2/dbpoolx.mod
> http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod
> file:///usr/share/xml/toto/toto.dtd
>

3
test/catalogs/docbook.script Normal file
View File

@ -0,0 +1,3 @@
resolve toto http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod
public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
resolve toto toto

14
test/catalogs/docbook.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/>
<public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod"/>
<public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod"/>
<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod"/>
<public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod"/>
<public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod"/>
<public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd"/>
<public publicId="-//OASIS//DTD DocBook MathML Module V1.0//EN" uri="http://www.oasis-open.org/docbook/xml/mathml/1.0/dbmathml.dtd"/>
<nextCatalog catalog="stylesheet.xml"/>
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/" rewritePrefix="/usr/share/xml/docbook/"/>
</catalog>

12
test/catalogs/stylesheet.xml Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE catalog
PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
prefer="public">
<!-- Circumvent relative URI in spec.xsl that doesn't work online -->
<uri name="http://www.oasis-open.org/committes/tr.xsl"
uri="http://www.oasis-open.org/committes/entity/stylesheets/base/tr.xsl"/>
<public publicId="toto" uri="file:///usr/share/xml/toto/toto.dtd"/>
</catalog>