diff options
| author | Rob Austein <sra@hactrn.net> | 2008-05-22 17:23:07 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-05-22 17:23:07 +0000 |
| commit | 80cd5c75f520561adcc7de3f4f76d161f150c5b5 (patch) | |
| tree | 77a5e22b132c8e54fcc17d41d25974b713b81707 /rpkid/rpki/relaxng.py | |
| parent | efc5613903579cf375a5495fb78e03235d780d44 (diff) | |
Back out excessively fancy RelaxNG, per previous log message
svn path=/rpkid/left-right-protocol-samples.xml; revision=1813
Diffstat (limited to 'rpkid/rpki/relaxng.py')
| -rw-r--r-- | rpkid/rpki/relaxng.py | 54 |
1 files changed, 8 insertions, 46 deletions
diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py index 38a8d0c0..26818db0 100644 --- a/rpkid/rpki/relaxng.py +++ b/rpkid/rpki/relaxng.py @@ -6,7 +6,7 @@ import lxml.etree ## Parsed RelaxNG left_right schema left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: left-right-schema.rnc 1806 2008-05-21 03:28:07Z sra $ + $Id: left-right-schema.rnc 1812 2008-05-22 17:14:18Z sra $ RelaxNG Schema for RPKI left-right protocol. @@ -938,22 +938,6 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <param name="maxLength">1024</param> </data> </define> - <define name="any"> - <element> - <anyName/> - <zeroOrMore> - <attribute> - <anyName/> - </attribute> - </zeroOrMore> - <choice> - <text/> - <zeroOrMore> - <ref name="any"/> - </zeroOrMore> - </choice> - </element> - </define> <define name="report_error_reply"> <element name="report_error"> <ref name="tag"/> @@ -962,12 +946,9 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <ref name="error"/> </attribute> <optional> - <choice> - <text/> - <zeroOrMore> - <ref name="any"/> - </zeroOrMore> - </choice> + <data type="string"> + <param name="maxLength">512000</param> + </data> </optional> </element> </define> @@ -1237,7 +1218,7 @@ up_down = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encodi ## Parsed RelaxNG publication schema publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: publication-schema.rnc 1811 2008-05-22 16:39:41Z sra $ + $Id: publication-schema.rnc 1812 2008-05-22 17:14:18Z sra $ RelaxNG Schema for RPKI publication protocol. @@ -1827,22 +1808,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en <param name="maxLength">1024</param> </data> </define> - <define name="any"> - <element> - <anyName/> - <zeroOrMore> - <attribute> - <anyName/> - </attribute> - </zeroOrMore> - <choice> - <text/> - <zeroOrMore> - <ref name="any"/> - </zeroOrMore> - </choice> - </element> - </define> <define name="report_error_reply"> <element name="report_error"> <optional> @@ -1852,12 +1817,9 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en <ref name="error"/> </attribute> <optional> - <choice> - <text/> - <zeroOrMore> - <ref name="any"/> - </zeroOrMore> - </choice> + <data type="string"> + <param name="maxLength">512000</param> + </data> </optional> </element> </define> |