From: Daniel Veillard Date: Fri, 24 Sep 2004 16:16:52 +0000 (+0000) Subject: add missing variable fixed some error callback data added new date:sum X-Git-Tag: v1.1.28~380 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a38e23f5841336380e9f007dc537de7b9cf63844;p=platform%2Fupstream%2Flibxslt.git add missing variable fixed some error callback data added new date:sum * Makefile.am: add missing variable * libxslt/transform.c: fixed some error callback data * tests/exslt/date/Makefile.am tests/exslt/date/sum*: added new date:sum testing from Derek Poon Daniel --- diff --git a/ChangeLog b/ChangeLog index abb28ca..969ecd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Sep 24 18:13:45 CEST 2004 Daniel Veillard + + * Makefile.am: add missing variable + * libxslt/transform.c: fixed some error callback data + * tests/exslt/date/Makefile.am tests/exslt/date/sum*: added new + date:sum testing from Derek Poon + Fri Sep 24 09:17:22 PDT 2004 William Brack * libexslt/date.c: fixed problem with empty sets, etc. diff --git a/Makefile.am b/Makefile.am index 68f9f9c..a599990 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,8 @@ bin_SCRIPTS = xslt-config dist-hook: cleanup libxslt.spec (cd $(srcdir) ; tar -cf - --exclude CVS win32 vms examples) | (cd $(distdir); tar xf -) +CVS_EXTRA_DIST = + EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \ FEATURES TODO Copyright libxslt.m4 \ win32/libxslt/libxslt.def win32/libxslt/libxslt.dsw \ diff --git a/NEWS b/NEWS index 3c15600..ba04b6e 100644 --- a/NEWS +++ b/NEWS @@ -10,9 +10,16 @@ ChangeLog.html to the CVS at http://cvs.gnome.org/viewcvs/libxslt/ code base.Those are the public releases made: +1.1.10: Aug 31 2004: + - build fix: NUL in c file blocking compilation on Solaris, Windows build + (Igor Zlatkovic) + - fix: key initialization problem (William Brack) + - documentation: fixed missing man page description for --path + + 1.1.9: Aug 22 2004: - build fixes: missing tests (William Brack), Python dependancies, Python - on 64bits boxes, --with-crypto flag (Rob Richards), + on 64bits boxes, --with-crypto flag (Rob Richards), - fixes: RVT key handling (William), Python binding (William and Sitsofe Wheeler), key and XPath troubles (William), template priority on imports (William), str:tokenize with empty strings (William), #default namespace diff --git a/libxslt/transform.c b/libxslt/transform.c index 3bf48ac..4515bb8 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -1566,7 +1566,7 @@ xsltApplyOneTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, */ ctxt->insert = insert; if (!xsltApplyFallbacks(ctxt, node, cur)) { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsltApplyOneTemplate: %s was not compiled\n", cur->name); } @@ -1601,7 +1601,7 @@ xsltApplyOneTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, } else if (IS_XSLT_NAME(cur, "message")) { xsltMessage(ctxt, node, cur); } else { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsltApplyOneTemplate: problem with xsl:%s\n", cur->name); } @@ -3083,11 +3083,11 @@ xsltCallTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, params = param; } } else { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:call-template: misplaced xsl:%s\n", cur->name); } } else { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:call-template: misplaced %s element\n", cur->name); } cur = cur->next; @@ -3329,17 +3329,17 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node, } } else if (IS_XSLT_NAME(cur, "sort")) { if (nbsorts >= XSLT_MAX_SORT) { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:apply-template: %s too many sort\n", node->name); } else { sorts[nbsorts++] = cur; } } else { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:apply-template: misplaced xsl:%s\n", cur->name); } } else { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:apply-template: misplaced %s element\n", cur->name); } cur = cur->next; @@ -3703,7 +3703,7 @@ xsltForEach(xsltTransformContextPtr ctxt, xmlNodePtr node, replacement = inst->children; while (IS_XSLT_ELEM(replacement) && (IS_XSLT_NAME(replacement, "sort"))) { if (nbsorts >= XSLT_MAX_SORT) { - xsltGenericError(xsltGenericDebugContext, + xsltGenericError(xsltGenericErrorContext, "xsl:for-each: too many sorts\n"); } else { sorts[nbsorts++] = replacement; diff --git a/tests/exslt/date/Makefile.am b/tests/exslt/date/Makefile.am index e208064..52e2308 100644 --- a/tests/exslt/date/Makefile.am +++ b/tests/exslt/date/Makefile.am @@ -25,6 +25,8 @@ EXTRA_DIST = \ add.2.out add.2.xml add.2.xsl \ add-duration.1.out add-duration.1.xml add-duration.1.xsl \ add-duration.2.out add-duration.2.xml add-duration.2.xsl \ + sum.1.out sum.1.xml sum.1.xsl \ + sum.2.out sum.2.xml sum.2.xsl \ difference.1.out difference.1.xml difference.1.xsl \ difference.2.out difference.2.xml difference.2.xsl \ duration.1.out duration.1.xml duration.1.xsl \ diff --git a/tests/exslt/date/sum.1.out b/tests/exslt/date/sum.1.out new file mode 100644 index 0000000..2397866 --- /dev/null +++ b/tests/exslt/date/sum.1.out @@ -0,0 +1,21 @@ + +sum : PT1M + PT2M +result : PT3M +sum : P1DT2H + PT3M + PT4S +result : P1DT2H3M4S +sum : PT20M + PT20M + PT20M +result : PT1H +sum : PT01S + PT02S + PT04S + PT8S + PT16S + PT32S +result : PT1M3S +sum : P1M +result : P1M +sum : PT70M +result : PT1H10M +sum : PT70M + P13M +result : P1Y1MT1H10M +sum : PT70M + -PT30M +result : PT40M +sum : PT1H10M + -PT30M + -PT30S +result : PT39M30S +sum : PT1M + -PT1M +result : P0D \ No newline at end of file diff --git a/tests/exslt/date/sum.1.xml b/tests/exslt/date/sum.1.xml new file mode 100644 index 0000000..1004a7d --- /dev/null +++ b/tests/exslt/date/sum.1.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/exslt/date/sum.1.xsl b/tests/exslt/date/sum.1.xsl new file mode 100644 index 0000000..642fafe --- /dev/null +++ b/tests/exslt/date/sum.1.xsl @@ -0,0 +1,20 @@ + + + + + + + +sum : +result : + + + + + + + + + diff --git a/tests/exslt/date/sum.2.err b/tests/exslt/date/sum.2.err new file mode 100644 index 0000000..0f63baf --- /dev/null +++ b/tests/exslt/date/sum.2.err @@ -0,0 +1,22 @@ +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +xmlXPathCompiledEval: evaluation failed +runtime error: file ./sum.2.xsl line 12 element value-of +xsltValueOf: text copy failed +no result for ./sum.2.xml diff --git a/tests/exslt/date/sum.2.out b/tests/exslt/date/sum.2.out new file mode 100644 index 0000000..e69de29 diff --git a/tests/exslt/date/sum.2.xml b/tests/exslt/date/sum.2.xml new file mode 100644 index 0000000..f5f77fe --- /dev/null +++ b/tests/exslt/date/sum.2.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/exslt/date/sum.2.xsl b/tests/exslt/date/sum.2.xsl new file mode 100644 index 0000000..642fafe --- /dev/null +++ b/tests/exslt/date/sum.2.xsl @@ -0,0 +1,20 @@ + + + + + + + +sum : +result : + + + + + + + + +