From: William M. Brack <wbrack@src.gnome.org>
Date: Sun, 21 Dec 2003 13:39:01 +0000 (+0000)
Subject: added namespace comparison for xsl:number count function (Bug 129057)
X-Git-Tag: v1.1.28~525
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=347a638f30b778a594ca52b96f7756ba69da250e;p=platform%2Fupstream%2Flibxslt.git

added namespace comparison for xsl:number count function (Bug 129057)

* libxslt/numbers.c: added namespace comparison for
  xsl:number count function (Bug 129057)
---

diff --git a/ChangeLog b/ChangeLog
index 3b9620a..af9203c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 21 21:38:11 HKT 2003 William Brack <wbrack@mmm.com.hk>
+
+	* libxslt/numbers.c: added namespace comparison for
+	  xsl:number count function (Bug 129057)
+
 Sun Dec 21 13:56:48 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* tests/docs/Makefile.am tests/docs/bug-139.xml
diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 668ca47..8adb09e 100644
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -663,9 +663,14 @@ xsltNumberFormatGetMultipleLevel(xsltTransformContextPtr context,
 		        xmlXPathNextPrecedingSibling(parser, preceding)) {
 		    if (count == NULL) {
 			if ((preceding->type == ancestor->type) &&
-			    /* FIXME */
-			    xmlStrEqual(preceding->name, ancestor->name))
-			    cnt++;
+			    xmlStrEqual(preceding->name, ancestor->name)){
+			    if ((preceding->ns == ancestor->ns) ||
+			        ((preceding->ns != NULL) &&
+				 (ancestor->ns != NULL) &&
+			         (xmlStrEqual(preceding->ns->href,
+			             ancestor->ns->href) )))
+			        cnt++;
+			}
 		    } else {
 			if (xsltTestCompMatchList(context, preceding,
 				                  countPat))