From ee2fa4feafd973e32ac321a8aee0caccbcfb4545 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 1 Dec 2009 13:44:34 +0000 Subject: Added option to return ISO week-numbering instead of default calendar-numbering. --- src/utility/datetimeUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/utility/datetimeUtils.cpp b/src/utility/datetimeUtils.cpp index cf05a932..6ea5be60 100644 --- a/src/utility/datetimeUtils.cpp +++ b/src/utility/datetimeUtils.cpp @@ -256,7 +256,7 @@ int datetimeUtils::getDayOfWeek(const int year, const int month, const int day) } -int datetimeUtils::getWeekOfYear(const int year, const int month, const int day) +int datetimeUtils::getWeekOfYear(const int year, const int month, const int day, const bool iso) { // Algorithm from http://personal.ecu.edu/mccartyr/ISOwdALG.txt @@ -322,7 +322,7 @@ int datetimeUtils::getWeekOfYear(const int year, const int month, const int day) WeekNumber -= 1; } - if (WeekNumber == 1 && month == 12) + if (!iso && (WeekNumber == 1 && month == 12)) WeekNumber = 53; return WeekNumber; -- cgit v1.2.3