--- parser3/src/classes/date.C 2003/03/24 09:39:52 1.42.2.11.2.5 +++ parser3/src/classes/date.C 2005/03/23 08:50:04 1.69 @@ -1,11 +1,11 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DATE_C="$Date: 2003/03/24 09:39:52 $"; +static const char * const IDENT_DATE_C="$Date: 2005/03/23 08:50:04 $"; #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() { return new VDate(0); } + Value* create_new_value(Pool&) { return new VDate(0); } public: MDate(); @@ -37,7 +37,7 @@ class Date_calendar_table_template_colum public: Date_calendar_table_template_columns(): ArrayString(6+2) { for(int i=0; i<=6; i++) { - char *cname=new char[1/*strlen("6")*/+1/*terminating 0*/]; + char *cname=new(PointerFreeGC) char[1/*strlen("6")*/+1/*terminating 0*/]; *this+=new String(cname, sprintf(cname, "%d", i)); // .i column name } *this+=new String("week"); @@ -50,30 +50,36 @@ Table date_calendar_table_template(new D // methods -static void _now(Request& r, MethodParams* params) { +static void _now(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); time_t t=time(0); - if(params->count()==1) // ^now(offset) - t+=(time_t)round(params->as_double(0, "offset must be double", r)*SECS_PER_DAY); + if(params.count()==1) // ^now(offset) + t+=(time_t)round(params.as_double(0, "offset must be double", r)*SECS_PER_DAY); 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] -time_t cstr_to_time_t(char *cstr, bool fail_on_error) { // used in image.C +/*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]==':'?':' + int 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); @@ -82,9 +88,10 @@ time_t cstr_to_time_t(char *cstr, bool f 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) { @@ -96,76 +103,64 @@ time_t cstr_to_time_t(char *cstr, bool f 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<count()==1) { + if(params.count()==1) { // ^create[2002-04-25 18:14:00] // ^create[18:14:00] - if(const String* sdate=(*params)[0]->get_string()) - t=cstr_to_time_t(sdate->cstrm(), true); + if(const String* sdate=params[0].get_string()) + 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 if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]]) + 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_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); - 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"); + 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; + 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); + vdate.set_time(tmIn); } else throw Exception("parser.runtime", 0, "invalid params count, must be 1 or >=2"); - vdate.set_time(t); } -static void _sql_string(Request& r, MethodParams*) { +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 char[size]; - time_t time=vdate.get_time(); - size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", localtime(&time)); + char *buf=new(PointerFreeGC) char[size]; + size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", vdate.get_localtime()); r.write_assign_lang(String(buf, size)); } - -static void _roll(Request& r, MethodParams* params) { +static void _roll(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); - const String& what=params->as_string(0, "'what' must be string"); + const String& what=params.as_string(0, "'what' must be string"); int oyear=0; int omonth=0; int oday=0; @@ -173,68 +168,90 @@ static void _roll(Request& r, MethodPara if(what=="year") offset=&oyear; else if(what=="month") offset=&omonth; else if(what=="day") offset=&oday; - else + else if(what=="TZ") { + const String& argument_tz=params.as_string(1, "'TZ' must be string"); + vdate.set_tz(&argument_tz); + return; + } else throw Exception("parser.runtime", &what, - "must be year|month|day"); + "must be year|month|day|TZ"); - *offset=params->as_int(1, "offset must be int", r); + *offset=params.as_int(1, "offset must be int", r); time_t self_time=vdate.get_time(); tm tmIn=*localtime(&self_time); tm tmSaved=tmIn; + int adjust_day=0; + time_t t_changed_date; + while(true) { + tmIn.tm_year+=oyear; + tmIn.tm_mon+=omonth; + tmIn.tm_mday+=oday+adjust_day; + tmIn.tm_hour=24/2; + tmIn.tm_min=0; + tmIn.tm_sec=0; + int saved_mon=(tmIn.tm_mon+12*100)%12; // crossing year boundary backwards + t_changed_date=mktime/*normalizetime*/(&tmIn); + if(t_changed_date<0) + throw Exception(0, + 0, + "bad resulting time (rolled out of valid date range)"); + if(oday==0 && tmIn.tm_mon!=saved_mon/*but it changed*/) { + if(adjust_day <= -3/*31->28 max, so never, but...*/) + throw Exception(0, + 0, + "bad resulting time (day hole still with %d day adjustment)", adjust_day ); + + tmIn=tmSaved; // restoring + --adjust_day; //retrying with prev day + } else + break; + } - tmIn.tm_year+=oyear; - tmIn.tm_mon+=omonth; - tmIn.tm_mday+=oday; - tmIn.tm_hour=24/2; - tmIn.tm_min=0; - tmIn.tm_sec=0; - time_t t=mktime/*normalizetime*/(&tmIn); - if(t<0) - throw Exception(0, - 0, - "bad resulting time (after roll)"); - if(oday==0 && tmIn.tm_mday!=tmSaved.tm_mday) - throw Exception(0, - 0, - "bad resulting time (day hole)", t); - - tm *tmOut=localtime(&t); + tm *tmOut=localtime(&t_changed_date); if(!tmOut) throw Exception(0, 0, - "bad resulting time (seconds from epoch=%ld)", t); + "bad resulting time (seconds from epoch=%d)", t_changed_date); - tmOut->tm_hour=tmSaved.tm_hour; - tmOut->tm_min=tmSaved.tm_min; - tmOut->tm_sec=tmSaved.tm_sec; + tmOut->tm_hour=tmSaved.tm_hour; + tmOut->tm_min=tmSaved.tm_min; + tmOut->tm_sec=tmSaved.tm_sec; tmOut->tm_isdst=-1; { - time_t t=mktime/*normalizetime*/(tmOut); + time_t t_changed_time=mktime/*normalizetime*/(tmOut); + /*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) throw Exception(0, 0, "bad resulting time (hour hole)"); + */ - if(t<0) + if(t_changed_time<0) throw Exception(0, 0, "bad resulting time (after reconstruction)"); - vdate.set_time(t); + vdate.set_time(t_changed_time); } } -static Table& fill_month_days(Request& r, MethodParams* params, bool rus){ - Table& result=*new Table(date_calendar_table_template); - - 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}; +static Table& fill_month_days(Request& r, MethodParams& params, bool rus){ + 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; + + 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, @@ -250,20 +267,25 @@ static Table& fill_month_days(Request& r for(int _day=1-weekDay1; _day<=monthDays;) { Table::element_type row(new ArrayString(7)); // calculating year week no [1..54] - char *weekno_buf; - size_t weekno_size; - int weekyear; + char *weekno_buf=0; // surely would be assigned to, but to calm down compiler + size_t weekno_size=0; // same + int weekyear=0; // same // 0..6 week days-cells fill with month days for(int wday=0; wday<7; wday++, _day++) { String* cell=new String; if(_day>=1 && _day<=monthDays) { - char *buf=new char[2+1]; - cell->append(buf, sprintf(buf, "%02d", _day), String::L_CLEAN); + char *buf=new(PointerFreeGC) char[2+1]; + cell->append_know_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN); } *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; @@ -273,7 +295,7 @@ static Table& fill_month_days(Request& r // 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 char[weekno_buf_size]; + weekno_buf=new(PointerFreeGC) char[weekno_buf_size]; weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n); } @@ -282,7 +304,7 @@ static Table& fill_month_days(Request& r *row+=new String(weekno_buf, weekno_size); // appending year week year { - char* buf=new char[4+1]; + char* buf=new(PointerFreeGC) char[4+1]; *row+=new String(buf, sprintf(buf, "%02d", weekyear)); } result+=row; @@ -291,7 +313,7 @@ static Table& fill_month_days(Request& r return result; } -static Table& fill_week_days(Request& r, MethodParams* params, bool rus){ +static Table& fill_week_days(Request& r, MethodParams& params, bool rus){ Table::columns_type columns(new ArrayString(4)); *columns+=new String("year"); *columns+=new String("month"); @@ -299,11 +321,17 @@ 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 day=params->as_int(3, "day must be int", r); - - tm tmIn={0, 0, 18, day, month, year-1900}; + 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 day=params.as_int(3, "day must be int", r); + + 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, @@ -321,7 +349,7 @@ static Table& fill_week_days(Request& r, tm *tmOut=localtime(&t); Table::element_type row(new ArrayString(4)); #define WDFILL(size, value) { \ - char *buf=new char[size+1]; \ + char *buf=new(PointerFreeGC) char[size+1]; \ *row+=new String(buf, sprintf(buf, "%0"#size"d", value)); \ } WDFILL(4, 1900+tmOut->tm_year); @@ -334,8 +362,8 @@ static Table& fill_week_days(Request& r, return result; } -static void _calendar(Request& r, MethodParams* params) { - const String& what=params->as_string(0, "format must be strig"); +static void _calendar(Request& r, MethodParams& params) { + const String& what=params.as_string(0, "format must be strig"); bool rus=false; if(what=="rus") rus=true; @@ -347,7 +375,7 @@ static void _calendar(Request& r, Method "must be rus|eng"); Table* table; - if(params->count()==1+2) + if(params.count()==1+2) table=&fill_month_days(r, params, rus); else // 1+3 table=&fill_week_days(r, params, rus); @@ -355,6 +383,26 @@ static void _calendar(Request& r, Method r.write_no_lang(*new VTable(table)); } +static void _unix_timestamp(Request& r, MethodParams& params) { + VDate& vdate=GET_SELF(r, VDate); + + if(params.count()==0) { + // ^date.unix-timestamp[] + r.write_no_lang(*new VInt((int)vdate.get_time())); + } else { + if(vdate.get_time()) + throw Exception(0, + 0, + "date object already constructed"); + + // ^unix-timestamp(time_t) + time_t t=(time_t)params.as_int(0, "Unix timestamp must be integer", r); + + vdate.set_time(t); + } +} + + // constructor MDate::MDate(): Methoded("date") { @@ -376,4 +424,7 @@ MDate::MDate(): Methoded("date") { // ^date:calendar[week|weekeng;year;month;day] = table add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); + + // ^unix-timestamp[] + add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1); }