--- parser3/src/classes/date.C 2004/02/19 15:38:00 1.65 +++ parser3/src/classes/date.C 2008/02/21 14:17:38 1.80 @@ -1,11 +1,11 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2004 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 * const IDENT_DATE_C="$Date: 2004/02/19 15:38:00 $"; +static const char * const IDENT_DATE_C="$Date: 2008/02/21 14:17:38 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -19,7 +19,7 @@ static const char * const IDENT_DATE_C=" 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(); @@ -61,14 +61,23 @@ static void _now(Request& r, MethodParam } /// shrinked range: 1970/1/1 to 2038/1/1 -static int to_tm_year(int iyear) { +static int to_year(int iyear) { if(iyear<1970 || iyear>2038) throw Exception(0, 0, "year '%d' is out of valid range", iyear); - return iyear-1900; + return iyear; +} + +static int to_month(int imonth) { + return max(1, min(imonth, 12)) -1; +} + +static int to_tm_year(int iyear) { + return to_year(iyear)-1900; } + // 2002-04-25 18:14:00 // 18:14:00 // 2002:04:25 [+maybe time] @@ -79,7 +88,7 @@ static int to_tm_year(int iyear) { "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); @@ -88,7 +97,8 @@ static int to_tm_year(int iyear) { 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; memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_isdst=-1; @@ -102,7 +112,7 @@ static int to_tm_year(int iyear) { tmIn.tm_mday=tmNow->tm_mday; goto date_part_set; } else - hour=min=sec=0; // not YYYY- & not HH: = just YYYY + 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; @@ -110,13 +120,13 @@ date_part_set: 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<=2) { // ^create(y;m;d[;h[;m[;s]]]) + } 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=to_tm_year(params.as_int(0, "year must be int", r)); @@ -141,22 +152,26 @@ static void _create(Request& r, MethodPa 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); vdate.set_time(tmIn); - } else - throw Exception("parser.runtime", - 0, - "invalid params count, must be 1 or >=2"); + }; } 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)); } +static void _gmt_string(Request& r, MethodParams&) { + VDate& vdate=GET_SELF(r, VDate); + + time_t when=vdate.get_time(); + + r.write_assign_lang(String(date_gmt_string(gmtime(&when)))); +} + static void _roll(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); @@ -173,7 +188,7 @@ static void _roll(Request& r, MethodPara vdate.set_tz(&argument_tz); return; } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &what, "must be year|month|day|TZ"); @@ -243,8 +258,8 @@ static Table& fill_month_days(Request& r Table::Action_options table_options; Table& result=*new Table(date_calendar_table_template, table_options); - 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; + int year=to_year(params.as_int(1, "year must be int", r)); + int month=to_month(params.as_int(2, "month must be int", r)); tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); @@ -287,16 +302,13 @@ static Table& fill_month_days(Request& r 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); } } @@ -321,8 +333,8 @@ static Table& fill_week_days(Request& r, *columns+=new String("weekday"); Table& result=*new Table(columns); - 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; + int year=to_year(params.as_int(1, "year must be int", r)); + int month=to_month(params.as_int(2, "month must be int", r)); int day=params.as_int(3, "day must be int", r); tm tmIn; @@ -370,7 +382,7 @@ static void _calendar(Request& r, Method else if(what=="eng") rus=false; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &what, "must be rus|eng"); @@ -402,22 +414,50 @@ static void _unix_timestamp(Request& r, } } +static void _last_day(Request& r, MethodParams& params) { + int year; + int month; + if(&r.get_self() == date_class) { + // ^date:lastday(year;month) + if(params.count() == 2) { + year=to_year(params.as_int(0, "year must be int", r)); + month=to_month(params.as_int(1, "month must be int", r)); + } else + throw Exception(PARSER_RUNTIME, + 0, + "year and month must be defined"); + } else { + // ^date.lastday[] + tm &tmIn=GET_SELF(r, VDate).get_localtime(); + year=tmIn.tm_year+1900; + month=tmIn.tm_mon; + } + r.write_assign_lang(*new VInt(getMonthDays(year, month))); +} + // constructor MDate::MDate(): Methoded("date") { - // ^now[] + // ^date::now[] add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); - // ^create(float days) + // ^date::create(float days) add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6); // old name for compatibility with <= v1.17 2002/2/18 12:13:42 paf add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6); - // ^sql-string[] + // ^date.sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0); - // ^roll(year|month|day;+/- 1) + // ^date.gmt-string[] + add_native_method("gmt-string", Method::CT_DYNAMIC, _gmt_string, 0, 0); + + // ^date:lastday(year;month) + // ^date.lastday[] + add_native_method("last-day", Method::CT_ANY, _last_day, 0, 2); + + // ^date.roll(year|month|day;+/- 1) add_native_method("roll", Method::CT_DYNAMIC, _roll, 2, 2); // ^date:calendar[month|montheng;year;month] = table @@ -425,6 +465,7 @@ MDate::MDate(): Methoded("date") { add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); - // ^unix-timestamp[] + // ^date.unix-timestamp[] + // ^date::unix-timestamp[] add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1); }