--- parser3/src/classes/date.C 2003/11/20 17:09:35 1.56 +++ parser3/src/classes/date.C 2003/11/27 10:20:32 1.58 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DATE_C="$Date: 2003/11/20 17:09:35 $"; +static const char * const IDENT_DATE_C="$Date: 2003/11/27 10:20:32 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -261,7 +261,7 @@ static Table& fill_month_days(Request& r memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_mday=1; tmIn.tm_mon=month; - tmIn.tm_yday=year-1900; + tmIn.tm_year=year-1900; time_t t=mktime(&tmIn); if(t<0) @@ -291,7 +291,12 @@ static Table& fill_month_days(Request& r *row+=cell; if(wday==(rus?3:4)/*thursday*/) { - tm tms={0,0,0, _day, month, year-1900}; + tm tms; + memset(&tms, 0, sizeof(tmIn)); + tms.tm_mday=_day; + tms.tm_mon=month; + tms.tm_year=year-1900; + /*normalize*/mktime(&tms); weekyear=tms.tm_year+1900; @@ -336,7 +341,7 @@ static Table& fill_week_days(Request& r, tmIn.tm_hour=18; tmIn.tm_mday=day; tmIn.tm_mon=month; - tmIn.tm_yday=year-1900; + tmIn.tm_year=year-1900; time_t t=mktime(&tmIn); if(t<0)