--- parser3/src/classes/date.C 2002/08/05 13:15:11 1.35 +++ parser3/src/classes/date.C 2003/11/03 11:06:18 1.49 @@ -1,13 +1,15 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DATE_C="$Date: 2002/08/05 13:15:11 $"; +static const char* IDENT_DATE_C="$Date: 2003/11/03 11:06:18 $"; #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vdate.h" @@ -15,27 +17,47 @@ static const char* IDENT_DATE_C="$Date: // class -class MDate : public Methoded { +class MDate: public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VDate(pool, 0); } + Value* create_new_value() { return new VDate(0); } public: - MDate(Pool& pool); + MDate(); public: // Methoded bool used_directly() { return true; } }; +// global variable + +DECLARE_CLASS_VAR(date, new MDate, 0); + +// helpers + +class Date_calendar_table_template_columns: public ArrayString { +public: + Date_calendar_table_template_columns(): ArrayString(6+2) { + for(int i=0; i<=6; i++) { + 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"); + *this+=new String("year"); + } +}; + + +Table date_calendar_table_template(new Date_calendar_table_template_columns); + // methods -static void _now(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); +static void _now(Request& r, MethodParams& params) { + VDate& vdate=GET_SELF(r, VDate); time_t t=time(0); - if(params->size()==1) // ^now(offset) - t+=(time_t)(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); + vdate.set_time(t); } static int NN_year_to_NNNN(int year) { @@ -46,279 +68,297 @@ static int NN_year_to_NNNN(int year) { return year; } -/// @test 09 ok? [octal maybe] -static void _create(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); +// 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; + } + char *cur=cstr; + int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':' + :'-'; + const char* year=lsplit(&cur, date_delim); + const char* month=lsplit(&cur, date_delim); + const char* mday=lsplit(&cur, ' '); + if(!month) + cur=cstr; + const char* hour=lsplit(&cur, ':'); + const char* min=lsplit(&cur, ':'); + const char* sec=cur; + + tm tmIn={0}; + tmIn.tm_isdst=-1; + if(!month) + if(min) { + year=mday=0; // HH:MM + time_t t=time(0); + tm *tmNow=localtime(&t); + tmIn.tm_year=tmNow->tm_year; + tmIn.tm_mon=tmNow->tm_mon; + 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; +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; +} + +static void _create(Request& r, MethodParams& params) { + VDate& vdate=GET_SELF(r, VDate); time_t t; - if(params->size()==1) { + if(params.count()==1) { // ^create[2002-04-25 18:14:00] // ^create[18:14:00] - if(const String *sdate=params->get(0).get_string()) { - char *cstr=sdate->cstr(); - char *cur=cstr; - const char *year=lsplit(&cur, '-'); - const char *month=lsplit(&cur, '-'); - const char *mday=lsplit(&cur, ' '); - if(!month) - cur=cstr; - const char *hour=lsplit(&cur, ':'); - const char *min=lsplit(&cur, ':'); - const char *sec=cur; - - tm tmIn={0}; - tmIn.tm_isdst=-1; - if(!month) - if(min) { - year=mday=0; // HH:MM - time_t t=time(0); - tm *tmNow=localtime(&t); - tmIn.tm_year=tmNow->tm_year; - tmIn.tm_mon=tmNow->tm_mon; - 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; -date_part_set: - tmIn.tm_hour=hour?atoi(hour):0; - tmIn.tm_min=min?atoi(min):0; - tmIn.tm_sec=sec?atoi(sec):0; - t=mktime(&tmIn); - if(t<0) - throw Exception(0, - sdate, - "invalid datetime"); - } else { // ^create(float days) - t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY); + if(const String* sdate=params[0].get_string()) + t=cstr_to_time_t(sdate->cstrm(), true); + else { // ^create(float days) + 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, - &method_name, + 0, "invalid datetime"); } - } else if(params->size()>=2) { // ^set(y;m;d[;h[;m[;s]]]) + } else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]]) tm tmIn={0}; 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->size()>2?params->as_int(2, "mday must be int", r):1; - if(params->size()>3) tmIn.tm_hour=params->as_int(3, "hour must be int", r); - if(params->size()>4) tmIn.tm_min=params->as_int(4, "minutes must be int", r); - if(params->size()>5) tmIn.tm_sec=params->as_int(5, "seconds must be int", r); + 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, - &method_name, + 0, "invalid datetime"); } else throw Exception("parser.runtime", - &method_name, + 0, "invalid params count, must be 1 or >=2"); - vdate->set_time(t); + vdate.set_time(t); } -static void _sql_string(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); +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=(char *)pool.malloc(size); - time_t time=vdate->get_time(); + char *buf=new(PointerFreeGC) char[size]; + time_t time=vdate.get_time(); size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", localtime(&time)); - String& string=*new(pool) String(pool); - string.APPEND_CLEAN(buf, size, - method_name.origin().file, - method_name.origin().line); - r.write_assign_lang(string); + r.write_assign_lang(String(buf, size)); } +static void _roll(Request& r, MethodParams& params) { + VDate& vdate=GET_SELF(r, VDate); -static void _roll(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); - - const String& what=params->as_string(0, "'what' must be string"); - int oyear=0; - int omonth=0; - int oday=0; + const String& what=params.as_string(0, "'what' must be string"); + int oyear=0; + int omonth=0; + int oday=0; int *offset; 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(); + 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, - &method_name, - "bad resulting time (after roll)"); - if(oday==0 && tmIn.tm_mday!=tmSaved.tm_mday) - throw Exception(0, - &method_name, - "bad resulting time (day hole)", t); - - tm *tmOut=localtime(&t); + tm *tmOut=localtime(&t_changed_date); if(!tmOut) throw Exception(0, - &method_name, - "bad resulting time (seconds from epoch=%ld)", t); + 0, + "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 april hour hole: [2am->3am) if( tmOut->tm_hour!=tmSaved.tm_hour ||tmOut->tm_min!=tmSaved.tm_min) throw Exception(0, - &method_name, + 0, "bad resulting time (hour hole)"); + */ - if(t<0) + if(t_changed_time<0) throw Exception(0, - &method_name, + 0, "bad resulting time (after reconstruction)"); - vdate->set_time(t); + vdate.set_time(t_changed_time); } } -static Table *fill_month_days(Request& r, - const String& method_name, MethodParams *params, bool rus){ - Pool& pool=r.pool(); - Table *result=new(pool) Table(pool, *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}; - time_t t=mktime(&tmIn); +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={0, 0, 0, 1, month, year-1900}; + time_t t=mktime(&tmIn); if(t<0) throw Exception(0, - &method_name, + 0, "invalid date"); - tm *tmOut=localtime(&t); - - int weekDay1=tmOut->tm_wday; + tm *tmOut=localtime(&t); + + int weekDay1=tmOut->tm_wday; if(rus) weekDay1=weekDay1?weekDay1-1:6; //sunday last - int monthDays=getMonthDays(year, month); - - for(int _day=1-weekDay1; _day<=monthDays;) { - Array& row=*new(pool) Array(pool, 7); + int monthDays=getMonthDays(year, month); + + 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; // 0..6 week days-cells fill with month days - for(int wday=0; wday<7; wday++, _day++) { - String *cell=new(pool) String(pool); + for(int wday=0; wday<7; wday++, _day++) { + String* cell=new String; if(_day>=1 && _day<=monthDays) { - char *buf=(char *)pool.malloc(2+1); - cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), - method_name.origin().file, method_name.origin().line); - } - row+=cell; + 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}; /*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[(tms.tm_year+1900) % 28]-3))/7; - weekno_buf=(char *)pool.malloc(weekno_buf_size); + 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); } } // appending year week no + *row+=new String(weekno_buf, weekno_size); + // appending year week year { - String *cell=new(pool) String(pool); - cell->APPEND_CLEAN(weekno_buf, weekno_size, - method_name.origin().file, method_name.origin().line); - row+=cell; + char* buf=new(PointerFreeGC) char[4+1]; + *row+=new String(buf, sprintf(buf, "%02d", weekyear)); } - *result+=&row; - } - - return result; + result+=row; + } + + return result; } -static Table *fill_week_days(Request& r, - const String& method_name, MethodParams *params, bool rus){ - Pool& pool=r.pool(); - Array& columns=*new(pool) Array(pool, 4); - columns+=new(pool) String(pool, "year"); - columns+=new(pool) String(pool, "month"); - columns+=new(pool) String(pool, "day"); - columns+=new(pool) String(pool, "weekday"); - Table *result=new(pool) Table(pool, &method_name, &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}; - time_t t=mktime(&tmIn); +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"); + *columns+=new String("day"); + *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}; + time_t t=mktime(&tmIn); if(t<0) throw Exception(0, - &method_name, + 0, "invalid date"); - tm *tmOut=localtime(&t); + tm *tmOut=localtime(&t); - int baseWeekDay=tmOut->tm_wday; + int baseWeekDay=tmOut->tm_wday; if(rus) baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last - - t-=baseWeekDay*SECS_PER_DAY; - - for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) { - tm *tmOut=localtime(&t); - Array& row=*new(pool) Array(pool, 4); + + t-=baseWeekDay*SECS_PER_DAY; + + for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) { + tm *tmOut=localtime(&t); + Table::element_type row(new ArrayString(4)); #define WDFILL(size, value) { \ - char *buf=(char *)pool.malloc(size+1); \ - String *cell=new(pool) String(pool); \ - cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \ - method_name.origin().file, \ - method_name.origin().line); \ - row+=cell; \ + char *buf=new(PointerFreeGC) char[size+1]; \ + *row+=new String(buf, sprintf(buf, "%0"#size"d", value)); \ } WDFILL(4, 1900+tmOut->tm_year); WDFILL(2, 1+tmOut->tm_mon); WDFILL(2, tmOut->tm_mday); WDFILL(2, tmOut->tm_wday); - *result+=&row; - } - - return result; + result+=row; + } + + return result; } -static void _calendar(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - 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; @@ -329,19 +369,33 @@ static void _calendar(Request& r, const &what, "must be rus|eng"); - Table *table; - if(params->size()==1+2) - table=fill_month_days(r, method_name, params, rus); + Table* table; + if(params.count()==1+2) + table=&fill_month_days(r, params, rus); else // 1+3 - table=fill_week_days(r, method_name, params, rus); + table=&fill_week_days(r, params, rus); + + r.write_no_lang(*new VTable(table)); +} - VTable& result=*new(pool) VTable(pool, table); - r.write_no_lang(result); +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 { + // ^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(Pool& apool) : Methoded(apool, "date") { +MDate::MDate(): Methoded("date") { // ^now[] add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); @@ -360,13 +414,7 @@ MDate::MDate(Pool& apool) : Methoded(apo // ^date:calendar[week|weekeng;year;month;day] = table add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); -} -// global variable - -Methoded *date_class; - -// creator -Methoded *MDate_create(Pool& pool) { - return date_class=new(pool) MDate(pool); + // ^unix-timestamp[] + add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1); }