--- parser3/src/classes/date.C 2002/04/16 08:59:25 1.26 +++ parser3/src/classes/date.C 2003/02/04 14:04:45 1.42.2.4 @@ -1,27 +1,23 @@ /** @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) - - $Id: date.C,v 1.26 2002/04/16 08:59:25 paf Exp $ */ +static const char* IDENT_DATE_C="$Date: 2003/02/04 14:04:45 $"; + #include "classes.h" #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vdate.h" #include "pa_vtable.h" -// defines - -#define DATE_CLASS_NAME "date" - // class class MDate : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VDate(pool, 0); } + ValuePtr create_new_value() { return ValuePtr(new VDate(0)); } public: MDate(Pool& pool); @@ -29,44 +25,117 @@ public: // Methoded bool used_directly() { return true; } }; +// helpers + +Table date_calendar_table_template; +/* + // date_calendar_table_template + { + Array *columns=NEW Array(pool); + for(int i=0; i<=6; i++) { + char *column=(char *)pool.malloc(MAX_NUMBER); + snprintf(column, MAX_NUMBER, "%d", i); + *columns+=NEW String(pool, column); // .i column name + } + *columns+=NEW String(pool, DATE_CALENDAR_WEEKNO_NAME); + *columns+=NEW String(pool, DATE_CALENDAR_WEEKYEAR_NAME); + date_calendar_table_template=NEW Table(pool, 0, columns); + } +*/ + // methods -static void _now(Request& r, const String& method_name, MethodParams *params) { +static void _now(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); 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); } -static void _create(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); +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; +} - time_t t; - if(params->size()==1) { // ^set(float days) - t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY); - if(t<0 || !localtime(&t)) +// 2002-04-25 18:14:00 +// 18:14:00 +// 2002:04:25 [+maybe time] +time_t cstr_to_time_t(char *cstr, const String *report_error_origin) { // used in image.C + 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(report_error_origin) throw Exception(0, - &method_name, + report_error_origin, "invalid datetime"); - } else if(params->size()>=2) { // ^set(y;m;d[;h[;m[;s]]]) + + return result; +} + +static void _create(Request& r, StringPtr method_name, MethodParams& params) { + Pool& pool=r.pool(); + VDate *vdate=static_cast(r.get_self()); + + time_t t; + if(params.count()==1) { + // ^create[2002-04-25 18:14:00] + // ^create[18:14:00] + if(const String *sdate=params.get(0).get_string()) + t=cstr_to_time_t(sdate->cstr(), sdate); + 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, + "invalid datetime"); + } + } else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]]) tm tmIn={0}; tmIn.tm_isdst=-1; - int year=params->as_int(0, "year must be int", r); - if(year<70) // 0..69 -> 100..169 [2000..2069] - year+=100; - if(year>=1900) - year-=1900; - tmIn.tm_year=year; - 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, @@ -79,9 +148,9 @@ static void _create(Request& r, const St vdate->set_time(t); } -static void _sql_string(Request& r, const String& method_name, MethodParams *) { +static void _sql_string(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); 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(); @@ -95,11 +164,11 @@ static void _sql_string(Request& r, cons } -static void _roll(Request& r, const String& method_name, MethodParams *params) { +static void _roll(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); - 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; @@ -112,7 +181,7 @@ static void _roll(Request& r, const Stri &what, "must be year|month|day"); - *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); @@ -163,12 +232,12 @@ static void _roll(Request& r, const Stri } static Table *fill_month_days(Request& r, - const String& method_name, MethodParams *params, bool rus){ + StringPtr method_name, MethodParams& params, bool rus){ Pool& pool=r.pool(); - Table *result=new(pool) Table(pool, &method_name, 0/*&columns*/); + 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; + 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); @@ -185,15 +254,51 @@ static Table *fill_month_days(Request& r for(int _day=1-weekDay1; _day<=monthDays;) { Array& row=*new(pool) Array(pool, 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); + String *cell=new(pool) String(pool); 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; + + 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[weekyear % 28]-3))/7; + weekno_buf=(char *)pool.malloc(weekno_buf_size); + weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n); + } + } + // appending year week no + { + String *cell=new(pool) String(pool); + cell->APPEND_CLEAN(weekno_buf, weekno_size, + method_name.origin().file, method_name.origin().line); + row+=cell; + } + // appending year week year + { + String *cell=new(pool) String(pool); + char *buf=(char *)pool.malloc(4+1); + cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", weekyear), + method_name.origin().file, method_name.origin().line); + row+=cell; + } *result+=&row; } @@ -201,7 +306,7 @@ static Table *fill_month_days(Request& r } static Table *fill_week_days(Request& r, - const String& method_name, MethodParams *params, bool rus){ + StringPtr method_name, MethodParams& params, bool rus){ Pool& pool=r.pool(); Array& columns=*new(pool) Array(pool, 4); columns+=new(pool) String(pool, "year"); @@ -210,9 +315,9 @@ static Table *fill_week_days(Request& r, 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); + 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); @@ -249,10 +354,10 @@ static Table *fill_week_days(Request& r, return result; } -static void _calendar(Request& r, const String& method_name, MethodParams *params) { +static void _calendar(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - const String& what=params->as_string(0, "format must be strig"); + const String& what=params.as_string(0, "format must be strig"); bool rus=false; if(what=="rus") rus=true; @@ -264,27 +369,24 @@ static void _calendar(Request& r, const "must be rus|eng"); Table *table; - if(params->size()==1+2) + if(params.count()==1+2) table=fill_month_days(r, method_name, params, rus); else // 1+3 table=fill_week_days(r, method_name, params, rus); VTable& result=*new(pool) VTable(pool, table); - result.set_name(method_name); r.write_no_lang(result); } // constructor -MDate::MDate(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), DATE_CLASS_NAME)); - - +MDate::MDate(Pool& apool) : Methoded(apool, "date") { // ^now[] add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); - // ^set(float days) + // ^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[]