From 87db3a84f90d739c04cce759e751b269b71820b3 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 10 Oct 2003 10:52:58 +0000 Subject: [PATCH] a bit of cleanup updated with the new result strings Daniel * error.c xmlschemas.c: a bit of cleanup * result/schemas/*.err: updated with the new result strings Daniel --- ChangeLog | 9 +++++++++ error.c | 4 ++-- result/schemas/all_0_3.err | 2 +- result/schemas/all_0_4.err | 2 +- result/schemas/all_0_5.err | 2 +- result/schemas/all_0_6.err | 2 +- result/schemas/all_0_7.err | 2 +- result/schemas/all_1_5.err | 2 +- result/schemas/all_2_0.err | 2 +- result/schemas/all_2_1.err | 2 +- result/schemas/all_2_2.err | 2 +- result/schemas/all_2_4.err | 2 +- result/schemas/all_2_5.err | 2 +- result/schemas/choice_0_2.err | 2 +- result/schemas/choice_0_3.err | 2 +- result/schemas/choice_0_4.err | 2 +- result/schemas/choice_0_5.err | 2 +- result/schemas/choice_0_6.err | 2 +- result/schemas/choice_1_2.err | 2 +- result/schemas/choice_1_3.err | 2 +- result/schemas/choice_1_5.err | 2 +- result/schemas/choice_1_6.err | 2 +- result/schemas/choice_2_4.err | 2 +- result/schemas/choice_2_6.err | 2 +- result/schemas/hexbinary_0_1.err | 18 +++++++++--------- result/schemas/list0_0_1.err | 2 +- result/schemas/list0_1_0.err | 2 +- result/schemas/list0_1_1.err | 2 +- xmlschemas.c | 4 ++-- 29 files changed, 47 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index b094e85d..c875742d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Oct 10 12:49:53 CEST 2003 Daniel Veillard + + * error.c xmlschemas.c: a bit of cleanup + * result/schemas/*.err: updated with the new result strings + +Fri Oct 10 03:58:39 PDT 2003 William Brack + + * xpath.c: fixed bug 124061 + Fri Oct 10 02:47:22 CEST 2003 Daniel Veillard * Makefile.am: cleanup diff --git a/error.c b/error.c index a1d60887..fcc0fdd4 100644 --- a/error.c +++ b/error.c @@ -311,10 +311,10 @@ xmlReportError(xmlErrorPtr err, xmlParserCtxtPtr ctxt, const char *str, channel(data, "regexp "); break; case XML_FROM_SCHEMASV: - channel(data, "Schemas validity"); + channel(data, "Schemas validity "); break; case XML_FROM_SCHEMASP: - channel(data, "Schemas parser"); + channel(data, "Schemas parser "); break; case XML_FROM_RELAXNGP: channel(data, "Relax-NG parser "); diff --git a/result/schemas/all_0_3.err b/result/schemas/all_0_3.err index daaf9a3c..ddc3785a 100644 --- a/result/schemas/all_0_3.err +++ b/result/schemas/all_0_3.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_3.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_0_4.err b/result/schemas/all_0_4.err index daaf9a3c..c5d87619 100644 --- a/result/schemas/all_0_4.err +++ b/result/schemas/all_0_4.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_0_5.err b/result/schemas/all_0_5.err index daaf9a3c..544a9a5b 100644 --- a/result/schemas/all_0_5.err +++ b/result/schemas/all_0_5.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_0_6.err b/result/schemas/all_0_6.err index daaf9a3c..f38f778d 100644 --- a/result/schemas/all_0_6.err +++ b/result/schemas/all_0_6.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_6.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_0_7.err b/result/schemas/all_0_7.err index daaf9a3c..5e40df06 100644 --- a/result/schemas/all_0_7.err +++ b/result/schemas/all_0_7.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_7.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_1_5.err b/result/schemas/all_1_5.err index daaf9a3c..544a9a5b 100644 --- a/result/schemas/all_1_5.err +++ b/result/schemas/all_1_5.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_2_0.err b/result/schemas/all_2_0.err index daaf9a3c..8416124b 100644 --- a/result/schemas/all_2_0.err +++ b/result/schemas/all_2_0.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_0.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_2_1.err b/result/schemas/all_2_1.err index daaf9a3c..129595f9 100644 --- a/result/schemas/all_2_1.err +++ b/result/schemas/all_2_1.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_1.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_2_2.err b/result/schemas/all_2_2.err index daaf9a3c..c3e04820 100644 --- a/result/schemas/all_2_2.err +++ b/result/schemas/all_2_2.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_2.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_2_4.err b/result/schemas/all_2_4.err index daaf9a3c..c5d87619 100644 --- a/result/schemas/all_2_4.err +++ b/result/schemas/all_2_4.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/all_2_5.err b/result/schemas/all_2_5.err index daaf9a3c..544a9a5b 100644 --- a/result/schemas/all_2_5.err +++ b/result/schemas/all_2_5.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/all_5.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_0_2.err b/result/schemas/choice_0_2.err index daaf9a3c..6abd515f 100644 --- a/result/schemas/choice_0_2.err +++ b/result/schemas/choice_0_2.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_2.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_0_3.err b/result/schemas/choice_0_3.err index daaf9a3c..149f969c 100644 --- a/result/schemas/choice_0_3.err +++ b/result/schemas/choice_0_3.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_3.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_0_4.err b/result/schemas/choice_0_4.err index daaf9a3c..88437680 100644 --- a/result/schemas/choice_0_4.err +++ b/result/schemas/choice_0_4.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_0_5.err b/result/schemas/choice_0_5.err index daaf9a3c..8861e996 100644 --- a/result/schemas/choice_0_5.err +++ b/result/schemas/choice_0_5.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_5.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_0_6.err b/result/schemas/choice_0_6.err index daaf9a3c..ffa476aa 100644 --- a/result/schemas/choice_0_6.err +++ b/result/schemas/choice_0_6.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_1_2.err b/result/schemas/choice_1_2.err index daaf9a3c..6abd515f 100644 --- a/result/schemas/choice_1_2.err +++ b/result/schemas/choice_1_2.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_2.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_1_3.err b/result/schemas/choice_1_3.err index daaf9a3c..149f969c 100644 --- a/result/schemas/choice_1_3.err +++ b/result/schemas/choice_1_3.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_3.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_1_5.err b/result/schemas/choice_1_5.err index daaf9a3c..8861e996 100644 --- a/result/schemas/choice_1_5.err +++ b/result/schemas/choice_1_5.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_5.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_1_6.err b/result/schemas/choice_1_6.err index daaf9a3c..ffa476aa 100644 --- a/result/schemas/choice_1_6.err +++ b/result/schemas/choice_1_6.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_2_4.err b/result/schemas/choice_2_4.err index daaf9a3c..88437680 100644 --- a/result/schemas/choice_2_4.err +++ b/result/schemas/choice_2_4.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/choice_2_6.err b/result/schemas/choice_2_6.err index daaf9a3c..ffa476aa 100644 --- a/result/schemas/choice_2_6.err +++ b/result/schemas/choice_2_6.err @@ -1 +1 @@ -Element doc content check failed +./test/schemas/choice_6.xml:1: element doc: Schemas validity error : Element doc content check failed diff --git a/result/schemas/hexbinary_0_1.err b/result/schemas/hexbinary_0_1.err index 028f36df..c134ddbf 100644 --- a/result/schemas/hexbinary_0_1.err +++ b/result/schemas/hexbinary_0_1.err @@ -1,9 +1,9 @@ -Element hex: failed to validate basic type hexBinary -Element hex: failed to validate basic type hexBinary -Element hex: failed to validate basic type hexBinary -Element hex: failed to validate basic type hexBinary -Element hex: failed to validate basic type hexBinary -Element hex: failed to validate basic type hexBinary -Failed to validate type with facet maxLength -Failed to validate type with facet length -Failed to validate type with facet length +./test/schemas/hexbinary_1.xml:4: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:5: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:6: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:7: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:8: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:9: element hex: Schemas validity error : Element hex: failed to validate basic type hexBinary +./test/schemas/hexbinary_1.xml:11: element hex2: Schemas validity error : Failed to validate type with facet maxLength +./test/schemas/hexbinary_1.xml:13: element hex3: Schemas validity error : Failed to validate type with facet length +./test/schemas/hexbinary_1.xml:14: element hex3: Schemas validity error : Failed to validate type with facet length diff --git a/result/schemas/list0_0_1.err b/result/schemas/list0_0_1.err index 71f9ed91..d82a4dc4 100644 --- a/result/schemas/list0_0_1.err +++ b/result/schemas/list0_0_1.err @@ -1 +1 @@ -Element test content check failed +./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element test content check failed diff --git a/result/schemas/list0_1_0.err b/result/schemas/list0_1_0.err index 71f9ed91..0a29e1d0 100644 --- a/result/schemas/list0_1_0.err +++ b/result/schemas/list0_1_0.err @@ -1 +1 @@ -Element test content check failed +./test/schemas/list0_0.xml:1: element test: Schemas validity error : Element test content check failed diff --git a/result/schemas/list0_1_1.err b/result/schemas/list0_1_1.err index 71f9ed91..d82a4dc4 100644 --- a/result/schemas/list0_1_1.err +++ b/result/schemas/list0_1_1.err @@ -1 +1 @@ -Element test content check failed +./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element test content check failed diff --git a/xmlschemas.c b/xmlschemas.c index a86ddaba..234c7e76 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -263,7 +263,7 @@ xmlSchemaVErr3(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr node, int error, } /* reajust to global error numbers */ error += XML_SCHEMAV_NOROOT - XML_SCHEMAS_ERR_NOROOT; - __xmlRaiseError(channel, data, ctxt, node, XML_FROM_SCHEMASP, + __xmlRaiseError(channel, data, ctxt, node, XML_FROM_SCHEMASV, error, XML_ERR_ERROR, NULL, 0, (const char *) str1, (const char *) str2, (const char *) str3, 0, 0, @@ -295,7 +295,7 @@ xmlSchemaVErr(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr node, int error, } /* reajust to global error numbers */ error += XML_SCHEMAV_NOROOT - XML_SCHEMAS_ERR_NOROOT; - __xmlRaiseError(channel, data, ctxt, node, XML_FROM_SCHEMASP, + __xmlRaiseError(channel, data, ctxt, node, XML_FROM_SCHEMASV, error, XML_ERR_ERROR, NULL, 0, (const char *) str1, (const char *) str2, NULL, 0, 0, msg, str1, str2);