--- parser3/src/classes/date.C 2003/11/20 15:35:29 1.53 +++ parser3/src/classes/date.C 2007/03/22 13:38:25 1.76 @@ -1,11 +1,11 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DATE_C="$Date: 2003/11/20 15:35:29 $"; +static const char * const IDENT_DATE_C="$Date: 2007/03/22 13:38:25 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -19,7 +19,7 @@ static const char* IDENT_DATE_C="$Date: class MDate: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&) { return new VDate(0); } + Value* create_new_value(Pool&, HashStringValue&) { return new VDate(0); } public: MDate(); @@ -60,27 +60,26 @@ static void _now(Request& r, MethodParam vdate.set_time(t); } -static int NN_year_to_NNNN(int year) { - if(year<70) // 0..69 -> 100..169 [2000..2069] - year+=100; - if(year>=1900) - year-=1900; - return year; +/// shrinked range: 1970/1/1 to 2038/1/1 +static int to_tm_year(int iyear) { + if(iyear<1970 || iyear>2038) + throw Exception(0, + 0, + "year '%d' is out of valid range", iyear); + return iyear-1900; } // 2002-04-25 18:14:00 // 18:14:00 // 2002:04:25 [+maybe time] -/*not static, used in image.C*/ time_t cstr_to_time_t(char *cstr, bool fail_on_error) { - if( !cstr || !*cstr ) { - if(fail_on_error) - throw Exception(0, - 0, - "empty string is not valid datetime"); - return 0; - } +/*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) { + if( !cstr || !*cstr ) + throw Exception(0, + 0, + "empty string is not valid datetime"); + char *cur=cstr; - int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':' + char date_delim=isdigit((unsigned char)cur[0])&&isdigit((unsigned char)cur[1])&&isdigit((unsigned char)cur[2])&&isdigit((unsigned char)cur[3])&&cur[4]==':'?':' :'-'; const char* year=lsplit(&cur, date_delim); const char* month=lsplit(&cur, date_delim); @@ -89,9 +88,10 @@ static int NN_year_to_NNNN(int year) { cur=cstr; const char* hour=lsplit(&cur, ':'); const char* min=lsplit(&cur, ':'); - const char* sec=cur; + const char* sec=lsplit(&cur, '.'); + const char* msec=cur; - tm tmIn={0}; + tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_isdst=-1; if(!month) if(min) { @@ -103,67 +103,54 @@ static int NN_year_to_NNNN(int year) { tmIn.tm_mday=tmNow->tm_mday; goto date_part_set; } else - hour=min=sec=0; // not YYYY- & not HH: = just YYYY - tmIn.tm_year=NN_year_to_NNNN(atoi(year)); - tmIn.tm_mon=month?atoi(month)-1:0; - tmIn.tm_mday=mday?atoi(mday):1; + hour=min=sec=msec=0; // not YYYY- & not HH: = just YYYY + tmIn.tm_year=to_tm_year(pa_atoi(year)); + tmIn.tm_mon=month?pa_atoi(month)-1:0; + tmIn.tm_mday=mday?pa_atoi(mday):1; date_part_set: - tmIn.tm_hour=hour?atoi(hour):0; - tmIn.tm_min=min?atoi(min):0; - tmIn.tm_sec=sec?atoi(sec):0; - time_t result=mktime(&tmIn); - if(result<0) - if(fail_on_error) - throw Exception(0, - 0, //report_error_origin, - "invalid datetime"); - - return result; + tmIn.tm_hour=hour?pa_atoi(hour):0; + tmIn.tm_min=min?pa_atoi(min):0; + tmIn.tm_sec=sec?pa_atoi(sec):0; + //tmIn.tm_[msec<cstrm(), true); + vdate.set_time(cstr_to_time_t(sdate->cstrm())); else { // ^create(float days) - t=(time_t)round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY); + time_t t=(time_t)round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY); if(t<0 || !localtime(&t)) throw Exception(0, 0, "invalid datetime"); + vdate.set_time(t); } - } else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]]) - tm tmIn={0}; + } else { // ^create(y;m;d[;h[;m[;s]]]) + assert(params.count()<=6); + tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_isdst=-1; - tmIn.tm_year=NN_year_to_NNNN(params.as_int(0, "year must be int", r)); + tmIn.tm_year=to_tm_year(params.as_int(0, "year must be int", r)); tmIn.tm_mon=params.as_int(1, "month must be int", r)-1; tmIn.tm_mday=params.count()>2?params.as_int(2, "mday must be int", r):1; - if(params.count()>3) tmIn.tm_hour=params.as_int(3, "hour must be int", r); + int savedHour=0; + if(params.count()>3) savedHour=tmIn.tm_hour=params.as_int(3, "hour must be int", r); if(params.count()>4) tmIn.tm_min=params.as_int(4, "minutes must be int", r); if(params.count()>5) tmIn.tm_sec=params.as_int(5, "seconds must be int", r); - t=mktime(&tmIn); - if(t<0) - throw Exception(0, - 0, - "invalid datetime"); - } else - throw Exception("parser.runtime", - 0, - "invalid params count, must be 1 or >=2"); - vdate.set_time(t); + vdate.set_time(tmIn); + }; } static void _sql_string(Request& r, MethodParams&) { VDate& vdate=GET_SELF(r, VDate); int size=1+ 4+1+2+1+2 +1+ 2+1+2+1+2 +1 +1; char *buf=new(PointerFreeGC) char[size]; - time_t time=vdate.get_time(); - size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", localtime(&time)); + size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", &vdate.get_localtime()); r.write_assign_lang(String(buf, size)); } @@ -232,7 +219,7 @@ static void _roll(Request& r, MethodPara tmOut->tm_isdst=-1; { time_t t_changed_time=mktime/*normalizetime*/(tmOut); - /*autofix: in msk timezone last sunday of april hour hole: [2am->3am) + /*autofix: in msk timezone last sunday of march hour hole: [2am->3am) if( tmOut->tm_hour!=tmSaved.tm_hour ||tmOut->tm_min!=tmSaved.tm_min) @@ -257,7 +244,12 @@ static Table& fill_month_days(Request& r int year=params.as_int(1, "year must be int", r); int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1; - tm tmIn={0, 0, 0, 1, month, year-1900}; + tm tmIn; + memset(&tmIn, 0, sizeof(tmIn)); + tmIn.tm_mday=1; + tmIn.tm_mon=month; + tmIn.tm_year=year-1900; + time_t t=mktime(&tmIn); if(t<0) throw Exception(0, @@ -286,18 +278,20 @@ 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; const int weekno_buf_size=2+1/*for stupid snprintfs*/ +1; - // http://www.merlyn.demon.co.uk/weekinfo.htm - const int FirstThurs[] = {7,5,4,3,2,7,6,5,4,2,1,7,6,4,3,2,1,6,5,4,3,1,7,6,5,3,2,1}; - int n=1 + (tms.tm_yday-(FirstThurs[weekyear % 28]-3))/7; weekno_buf=new(PointerFreeGC) char[weekno_buf_size]; - weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n); + VDate::yw week = VDate::CalcWeek(tms); + weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", week.week); } } @@ -326,7 +320,13 @@ static Table& fill_week_days(Request& r, int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1; int day=params.as_int(3, "day must be int", r); - tm tmIn={0, 0, 18, day, month, year-1900}; + tm tmIn; + memset(&tmIn, 0, sizeof(tmIn)); + tmIn.tm_hour=18; + tmIn.tm_mday=day; + tmIn.tm_mon=month; + tmIn.tm_year=year-1900; + time_t t=mktime(&tmIn); if(t<0) throw Exception(0,