fixed problem with day-of-week-in-month (bug 157592) with patch from Sal

* libexslt/date.c: fixed problem with day-of-week-in-month
  (bug 157592) with patch from Sal Paradise
* tests/exslt/date/datetime.1.out: corrected expected output
  after above fix

diff --git a/ChangeLog b/ChangeLog
index ece0fbb..6fc464a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov  8 11:41:32 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+       * libexslt/date.c: fixed problem with day-of-week-in-month
+         (bug 157592) with patch from Sal Paradise
+       * tests/exslt/date/datetime.1.out: corrected expected output
+         after above fix
+
 Mon Nov  1 15:57:24 CET 2004 Daniel Veillard <daniel@veillard.com>
 
        * tests/general/bug-155.*, tests/general/Makefile.am,

diff --git a/libexslt/date.c b/libexslt/date.c
index 1f4cc25..641fde3 100644 (file)
--- a/libexslt/date.c
+++ b/libexslt/date.c
@@ -2203,7 +2203,7 @@ exsltDateWeekInMonth (const xmlChar *dateTime)
      */
     fdiw = (_exsltDateDayInWeek(fdiy, dt->value.date.year) + 6) % 7;
 
-    ret = ((dt->value.date.day + fdiw) / 7) + 1;
+    ret = ((dt->value.date.day + fdiw - 1) / 7) + 1;
 
     exsltDateFreeDate(dt);
 
@@ -2348,7 +2348,7 @@ exsltDateDayOfWeekInMonth (const xmlChar *dateTime)
        }
     }
 
-    ret = (dt->value.date.day / 7) + 1;
+    ret = ((dt->value.date.day -1) / 7) + 1;
 
     exsltDateFreeDate(dt);
 

diff --git a/tests/exslt/date/datetime.1.out b/tests/exslt/date/datetime.1.out
index 7ea9826..ca0996c 100644 (file)
--- a/tests/exslt/date/datetime.1.out
+++ b/tests/exslt/date/datetime.1.out
@@ -10,7 +10,7 @@
     week-in-year         : 9
     day-in-year          : 59
     day-in-month         : 28
-    day-of-week-in-month : 5
+    day-of-week-in-month : 4
     day-in-week          : 4
     day-name             : Wednesday
     day-abbreviation     : Wed