--- parser3/src/classes/date.C 2002/03/05 12:20:48 1.18 +++ parser3/src/classes/date.C 2002/08/05 13:15:11 1.35 @@ -3,20 +3,16 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: date.C,v 1.18 2002/03/05 12:20:48 paf Exp $ */ +static const char* IDENT_DATE_C="$Date: 2002/08/05 13:15:11 $"; + #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 { @@ -31,43 +27,97 @@ public: // Methoded // methods -static void _now(Request& r, const String& method_name, MethodParams *) { +static void _now(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VDate *vdate=static_cast(r.self); - vdate->set_time(time(0)); + + 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); + + 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; } +/// @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); - time_t time; - if(params->size()==1) // ^set(float days) - time=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY); - else if(params->size()>=3) { // ^set(y;m;d[;h[;m[;s]]]) + time_t t; + if(params->size()==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(t<0 || !localtime(&t)) + throw Exception(0, + &method_name, + "invalid datetime"); + } + } else if(params->size()>=2) { // ^set(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_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->as_int(2, "mday must be int", r); + 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); - time=mktime(&tmIn); - if(time<0) - throw Exception(0, 0, + t=mktime(&tmIn); + if(t<0) + throw Exception(0, &method_name, "invalid datetime"); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, - "invalid params count, must be 1 or >=3"); - vdate->set_time(time); + "invalid params count, must be 1 or >=2"); + vdate->set_time(t); } static void _sql_string(Request& r, const String& method_name, MethodParams *) { @@ -82,8 +132,7 @@ static void _sql_string(Request& r, cons string.APPEND_CLEAN(buf, size, method_name.origin().file, method_name.origin().line); - Value& result=*new(pool) VString(string); - r.write_assign_lang(result); + r.write_assign_lang(string); } @@ -100,42 +149,55 @@ static void _roll(Request& r, const Stri else if(what=="month") offset=&omonth; else if(what=="day") offset=&oday; else - throw Exception(0, 0, + throw Exception("parser.runtime", &what, "must be year|month|day"); *offset=params->as_int(1, "offset must be int", r); - if(!(*offset==1 || *offset==-1)) - throw Exception(0, 0, - &method_name, - "offset must be +/- 1"); time_t self_time=vdate->get_time(); tm tmIn=*localtime(&self_time); - // we will preserve daytime from day-light-saving shifts across roll tm tmSaved=tmIn; - tmIn.tm_hour=24/2; tmIn.tm_min=tmIn.tm_sec=0; - tmIn.tm_year+=oyear; - time_t t=mktime(&tmIn); - t+=omonth*getMonthDays(tmIn.tm_year, (tmIn.tm_mon+(omonth<0?-1:0)+12)%12)*SECS_PER_DAY; - t+=oday*SECS_PER_DAY; - + 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); if(!tmOut) - throw Exception(0, 0, + throw Exception(0, &method_name, "bad resulting time (seconds from epoch=%ld)", t); 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(tmOut); + time_t t=mktime/*normalizetime*/(tmOut); + if( + tmOut->tm_hour!=tmSaved.tm_hour + ||tmOut->tm_min!=tmSaved.tm_min) + throw Exception(0, + &method_name, + "bad resulting time (hour hole)"); + if(t<0) - throw Exception(0, 0, - &method_name, - "bad resulting time (after reconstruction)"); + throw Exception(0, + &method_name, + "bad resulting time (after reconstruction)"); vdate->set_time(t); } @@ -144,7 +206,7 @@ static void _roll(Request& r, const Stri 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, &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; @@ -152,7 +214,7 @@ static Table *fill_month_days(Request& r tm tmIn={0, 0, 0, 1, month, year-1900}; time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, 0, + throw Exception(0, &method_name, "invalid date"); tm *tmOut=localtime(&t); @@ -164,15 +226,40 @@ 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; + // 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); + + 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); + 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; + } *result+=&row; } @@ -186,7 +273,7 @@ static Table *fill_week_days(Request& r, columns+=new(pool) String(pool, "year"); columns+=new(pool) String(pool, "month"); columns+=new(pool) String(pool, "day"); - columns+=new(pool) String(pool, "week_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); @@ -196,7 +283,7 @@ static Table *fill_week_days(Request& r, tm tmIn={0, 0, 18, day, month, year-1900}; time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, 0, + throw Exception(0, &method_name, "invalid date"); tm *tmOut=localtime(&t); @@ -238,7 +325,7 @@ static void _calendar(Request& r, const else if(what=="eng") rus=false; else - throw Exception(0, 0, + throw Exception("parser.runtime", &what, "must be rus|eng"); @@ -249,21 +336,18 @@ static void _calendar(Request& r, const 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, 0); + 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[]