Re: [xml] [PATCH] Do normalize string-based datatype value in RelaxNG facet checking
Okay looks fine,
Applied and pushed to head,
thanks Audric and Jan,
Daniel
On Fri, Mar 11, 2016 at 09:15:15PM -0500, Audric Schiltknecht wrote:
> Original patch is from Jan Pokorný .
> Improve it according to reviews and add test files.
> ---
> include/libxml/schemasInternals.h | 92
> +++
> result/relaxng/pattern3_1 | 0
> result/relaxng/pattern3_1.err | 1 +
> test/relaxng/pattern3.rng | 11 +
> test/relaxng/pattern3_1.xml | 1 +
> xmlschemastypes.c | 10 -
> 6 files changed, 68 insertions(+), 47 deletions(-)
> create mode 100644 result/relaxng/pattern3_1
> create mode 100644 result/relaxng/pattern3_1.err
> create mode 100644 test/relaxng/pattern3.rng
> create mode 100644 test/relaxng/pattern3_1.xml
>
> diff --git a/include/libxml/schemasInternals.h
> b/include/libxml/schemasInternals.h
> index 4f0ca9a..c7cf552 100644
> --- a/include/libxml/schemasInternals.h
> +++ b/include/libxml/schemasInternals.h
> @@ -28,52 +28,52 @@ extern "C" {
>
> typedef enum {
> XML_SCHEMAS_UNKNOWN = 0,
> -XML_SCHEMAS_STRING,
> -XML_SCHEMAS_NORMSTRING,
> -XML_SCHEMAS_DECIMAL,
> -XML_SCHEMAS_TIME,
> -XML_SCHEMAS_GDAY,
> -XML_SCHEMAS_GMONTH,
> -XML_SCHEMAS_GMONTHDAY,
> -XML_SCHEMAS_GYEAR,
> -XML_SCHEMAS_GYEARMONTH,
> -XML_SCHEMAS_DATE,
> -XML_SCHEMAS_DATETIME,
> -XML_SCHEMAS_DURATION,
> -XML_SCHEMAS_FLOAT,
> -XML_SCHEMAS_DOUBLE,
> -XML_SCHEMAS_BOOLEAN,
> -XML_SCHEMAS_TOKEN,
> -XML_SCHEMAS_LANGUAGE,
> -XML_SCHEMAS_NMTOKEN,
> -XML_SCHEMAS_NMTOKENS,
> -XML_SCHEMAS_NAME,
> -XML_SCHEMAS_QNAME,
> -XML_SCHEMAS_NCNAME,
> -XML_SCHEMAS_ID,
> -XML_SCHEMAS_IDREF,
> -XML_SCHEMAS_IDREFS,
> -XML_SCHEMAS_ENTITY,
> -XML_SCHEMAS_ENTITIES,
> -XML_SCHEMAS_NOTATION,
> -XML_SCHEMAS_ANYURI,
> -XML_SCHEMAS_INTEGER,
> -XML_SCHEMAS_NPINTEGER,
> -XML_SCHEMAS_NINTEGER,
> -XML_SCHEMAS_NNINTEGER,
> -XML_SCHEMAS_PINTEGER,
> -XML_SCHEMAS_INT,
> -XML_SCHEMAS_UINT,
> -XML_SCHEMAS_LONG,
> -XML_SCHEMAS_ULONG,
> -XML_SCHEMAS_SHORT,
> -XML_SCHEMAS_USHORT,
> -XML_SCHEMAS_BYTE,
> -XML_SCHEMAS_UBYTE,
> -XML_SCHEMAS_HEXBINARY,
> -XML_SCHEMAS_BASE64BINARY,
> -XML_SCHEMAS_ANYTYPE,
> -XML_SCHEMAS_ANYSIMPLETYPE
> +XML_SCHEMAS_STRING = 1,
> +XML_SCHEMAS_NORMSTRING = 2,
> +XML_SCHEMAS_DECIMAL = 3,
> +XML_SCHEMAS_TIME = 4,
> +XML_SCHEMAS_GDAY = 5,
> +XML_SCHEMAS_GMONTH = 6,
> +XML_SCHEMAS_GMONTHDAY = 7,
> +XML_SCHEMAS_GYEAR = 8,
> +XML_SCHEMAS_GYEARMONTH = 9,
> +XML_SCHEMAS_DATE = 10,
> +XML_SCHEMAS_DATETIME = 11,
> +XML_SCHEMAS_DURATION = 12,
> +XML_SCHEMAS_FLOAT = 13,
> +XML_SCHEMAS_DOUBLE = 14,
> +XML_SCHEMAS_BOOLEAN = 15,
> +XML_SCHEMAS_TOKEN = 16,
> +XML_SCHEMAS_LANGUAGE = 17,
> +XML_SCHEMAS_NMTOKEN = 18,
> +XML_SCHEMAS_NMTOKENS = 19,
> +XML_SCHEMAS_NAME = 20,
> +XML_SCHEMAS_QNAME = 21,
> +XML_SCHEMAS_NCNAME = 22,
> +XML_SCHEMAS_ID = 23,
> +XML_SCHEMAS_IDREF = 24,
> +XML_SCHEMAS_IDREFS = 25,
> +XML_SCHEMAS_ENTITY = 26,
> +XML_SCHEMAS_ENTITIES = 27,
> +XML_SCHEMAS_NOTATION = 28,
> +XML_SCHEMAS_ANYURI = 29,
> +XML_SCHEMAS_INTEGER = 30,
> +XML_SCHEMAS_NPINTEGER = 31,
> +XML_SCHEMAS_NINTEGER = 32,
> +XML_SCHEMAS_NNINTEGER = 33,
> +XML_SCHEMAS_PINTEGER = 34,
> +XML_SCHEMAS_INT = 35,
> +XML_SCHEMAS_UINT = 36,
> +XML_SCHEMAS_LONG = 37,
> +XML_SCHEMAS_ULONG = 38,
> +XML_SCHEMAS_SHORT = 39,
> +XML_SCHEMAS_USHORT = 40,
> +XML_SCHEMAS_BYTE = 41,
> +XML_SCHEMAS_UBYTE = 42,
> +XML_SCHEMAS_HEXBINARY = 43,
> +XML_SCHEMAS_BASE64BINARY = 44,
> +XML_SCHEMAS_ANYTYPE = 45,
> +XML_SCHEMAS_ANYSIMPLETYPE = 46
> } xmlSchemaValType;
>
> /*
> diff --git a/result/relaxng/pattern3_1 b/result/relaxng/pattern3_1
> new file mode 100644
> index 000..e69de29
> diff --git a/result/relaxng/pattern3_1.err b/result/relaxng/pattern3_1.err
> new file mode 100644
> index 000..b1a9803
> --- /dev/null
> +++ b/result/relaxng/pattern3_1.err
> @@ -0,0 +1 @@
> +./test/relaxng/pattern3_1.xml validates
> diff --git a/test/relaxng/pattern3.rng b/test/relaxng/pattern3.rng
> new file mode 100644
> index 000..fa4434f
> --- /dev/null
> +++ b/test/relaxng/pattern3.rng
> @@ -0,0 +1,11 @@
> +
> +http://relaxng.org/ns/structure/1.0";
> +datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
> +
> +
> +
> +[a-z]+
> +
> +
> +
> +
> diff --git a/test/relaxng/pattern3_1.xml b/test/relaxng/pattern3_1.xml
> new file mode 100644
> index 000..f559cd3
> --- /dev/null
> +++ b/test/relaxng/pattern3_1.xml
> @@ -0,0 +1 @@
> + ooo
> diff --git a/xmlschemastypes.c b/xmlschemastypes.c
> index ff64f50..3c9514c 100644
> --- a/xmlschemastypes.c
> +++ b/xmlschemastypes.c
> @@ -5315,7 +5315,15 @@ xmlSchemaValidateFacetInternal
[xml] Additional regexp test files
Hi there,
Please can I submit the following regexp test files that should pass,
but when I test them they fail. (I'm afraid I'm not smart enough to
suggest how to fix the code!)
I've attached them and included a git patch so hopefully one of the
formats is convenient for you. If not, let me know what would work
better. I've included them inline below so you can do a quick scan.
test/regexp/fussyipaddress
--
=>((1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])
192.168.254.0
test/regexp/timestamp
-
=>\d{8}T\d{6}\.?\d{0,6}
# This gives incorrect result
20160412T112319
# These give correct result
20160412T112319.
20160412T112319.43
20160412T112319.432312
Thanks,
Pete.
--
-
Pete Cordell
Codalogic Ltd
C++ tools for C++ programmers, http://codalogic.com
Read & write XML in C++, http://www.xml2cpp.com
-
>From 8353cdd05e3ad8c241e5383ca0745948f7a6cc58 Mon Sep 17 00:00:00 2001
From: Pete Cordell
Date: Fri, 15 Apr 2016 17:33:17 +0100
Subject: [PATCH] Added regexp tests that fail but should pass
---
test/regexp/fussyipaddress | 2 ++
test/regexp/timestamp | 7 +++
2 files changed, 9 insertions(+)
create mode 100644 test/regexp/fussyipaddress
create mode 100644 test/regexp/timestamp
diff --git a/test/regexp/fussyipaddress b/test/regexp/fussyipaddress
new file mode 100644
index 000..3e4b44f
--- /dev/null
+++ b/test/regexp/fussyipaddress
@@ -0,0 +1,2 @@
+=>((1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])
+192.168.254.0
diff --git a/test/regexp/timestamp b/test/regexp/timestamp
new file mode 100644
index 000..0cc4b59
--- /dev/null
+++ b/test/regexp/timestamp
@@ -0,0 +1,7 @@
+=>\d{8}T\d{6}\.?\d{0,6}
+# This gives incorrect result
+20160412T112319
+# These give correct result
+20160412T112319.
+20160412T112319.43
+20160412T112319.432312
--
2.5.3.windows.1
=>((1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])
192.168.254.0
=>\d{8}T\d{6}\.?\d{0,6}
# This gives incorrect result
20160412T112319
# These give correct result
20160412T112319.
20160412T112319.43
20160412T112319.432312
___
xml mailing list, project page http://xmlsoft.org/
xml@gnome.org
https://mail.gnome.org/mailman/listinfo/xml
Re: [xml] Moving to time based releases
2016-04-15 6:32 GMT-06:00 Daniel Veillard : > Hi everbody, > > It's both too easy to let things slip and very painful to procrastinate, > so to limit both and try to make the audience happier, I have decided to > switch libxml2 and libxslt to time based releases. At the tune of 2 releases > per year, considering the stability of the code I think it's reasonable. > For simplicity I will release both on the same day. > > So what does that mean ? > > - that libxml2-2.9.4 should be out on May 20 > - that libxslt-1.1.29 should be out on May 20 > - that there should be a release candidate 1 around May 1st for both of > them then an RC2 around the 10th May and a push on the 20 > - that if you have a patch posted to either list or bugzilla which wasn't > commented on or applied, it's fine and recommended to pester me with > a private email (might be good to rebase in case that's a really old one) > - if we are getting close to May 1st and your patch isn't in, raise the > point here, me and Nick Wellnhofer on the XSLT side will make sure they > go in. > - if after May 1st there hasn't been an RC1 people should complain here > in case I forgot my promise (and same for RC2 and final) > - and around Nov 1st watch for another cycle > > I really hope this works, that's what I did for my other project (libvirt > but with a 1 month cadence) and this really improves everybody's life! > > So send those requests (Patrick Monnerat and Alex Henrie, no need to send > again now) for patch needing processing, Thanks. I agree that time-based releases make sense for a project like this. -Alex ___ xml mailing list, project page http://xmlsoft.org/ xml@gnome.org https://mail.gnome.org/mailman/listinfo/xml
Re: [xml] [PATCH 0/3] Fix a couple of typos
On Wed, Apr 13, 2016 at 04:56:05PM +0200, Jan Pokorný wrote: > Hello Daniel, > > another couple of typos discovered over time. > > Note that especially the middle one asks for regenerating xml/html files > that are also tracked in the repo (omitted from manual modification). Sure, fine, applied and pushed, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veill...@redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/ ___ xml mailing list, project page http://xmlsoft.org/ xml@gnome.org https://mail.gnome.org/mailman/listinfo/xml
[xml] Moving to time based releases
Hi everbody, It's both too easy to let things slip and very painful to procrastinate, so to limit both and try to make the audience happier, I have decided to switch libxml2 and libxslt to time based releases. At the tune of 2 releases per year, considering the stability of the code I think it's reasonable. For simplicity I will release both on the same day. So what does that mean ? - that libxml2-2.9.4 should be out on May 20 - that libxslt-1.1.29 should be out on May 20 - that there should be a release candidate 1 around May 1st for both of them then an RC2 around the 10th May and a push on the 20 - that if you have a patch posted to either list or bugzilla which wasn't commented on or applied, it's fine and recommended to pester me with a private email (might be good to rebase in case that's a really old one) - if we are getting close to May 1st and your patch isn't in, raise the point here, me and Nick Wellnhofer on the XSLT side will make sure they go in. - if after May 1st there hasn't been an RC1 people should complain here in case I forgot my promise (and same for RC2 and final) - and around Nov 1st watch for another cycle I really hope this works, that's what I did for my other project (libvirt but with a 1 month cadence) and this really improves everybody's life! So send those requests (Patrick Monnerat and Alex Henrie, no need to send again now) for patch needing processing, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veill...@redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/ ___ xml mailing list, project page http://xmlsoft.org/ xml@gnome.org https://mail.gnome.org/mailman/listinfo/xml
Re: [xml] Which version of XPath xmllint support?
On Thu, Apr 14, 2016 at 02:34:14PM -0500, Peng Yu wrote: > Hi, I don't find in the man page which version of XPath xmllint > support. Could anybody let me know? Thanks. it's XPath 1.0 Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veill...@redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/ ___ xml mailing list, project page http://xmlsoft.org/ xml@gnome.org https://mail.gnome.org/mailman/listinfo/xml
