github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- Plugged in the proper ISO 8601 week number calculation function.

Browse Source 
git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14932 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2005-05-07 14:03:08 +00:00
parent 3bd6766484
commit 07056f3e26
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
library/time_strftime.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: time_strftime.c,v 1.11 2005-05-07 13:40:19 obarthel Exp $ * $Id: time_strftime.c,v 1.12 2005-05-07 14:03:08 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@ -102,6 +102,37 @@ store_string_via_hook(const char * string,int len,struct Hook * hook)
/****************************************************************************/ /****************************************************************************/
/* The algorithm for calculating the ISO 8601 week number value comes from
the "Calendar FAQ" at <http://www.tondering.dk/claus/calendar.html>. */
INLINE STATIC int
julian_day(int day,int month,int year)
{
int a,y,m,result;
a = (14 - month) / 12;
y = year + 4800 - a;
m = month + 12 * a - 3;
result = day + (153 * m + 2) / 5 + 365 * y + (y/4) - (y/100) + (y/400) - 32045;
}
STATIC int
iso8601_calendar_week(int day,int month,int year)
{
int J = julian_day(day,month,year);
int d1,d4,L,result;
d4 = (J + 31741 - (J % 7)) % 146097 % 36524 % 1461;
L = d4 / 1460;
d1 = ((d4 - L) % 365) + L;
result = (d1 / 7) + 1;
return(result);
}
/****************************************************************************/
STATIC VOID STATIC VOID
format_date(const char *format,const struct tm *tm,struct Hook * hook) format_date(const char *format,const struct tm *tm,struct Hook * hook)
{ {
@ -321,10 +352,11 @@ format_date(const char *format,const struct tm *tm,struct Hook * hook)
/* ISO 8601 week number ("01"-"53"; C99). */ /* ISO 8601 week number ("01"-"53"; C99). */
case 'V': case 'V':
week_number = (tm->tm_yday + 7 - ((tm->tm_wday + 6) % 7)) / 7; assert( 1 <= tm->tm_mday && tm->tm_mday <= 31 );
if(week_number < 1) assert( 0 <= tm->tm_mon && tm->tm_mon <= 11 );
week_number = 53; assert( 0 <= tm->tm_year );
week_number = iso8601_calendar_week(tm->tm_mday,tm->tm_mon+1,tm->tm_year + 1900);
__number_to_string(week_number,buffer,sizeof(buffer),2); __number_to_string(week_number,buffer,sizeof(buffer),2);
store_string_via_hook(buffer,2,hook); store_string_via_hook(buffer,2,hook);
break; break;