--- parser3/src/classes/date.C 2001/11/05 11:46:20 1.12 +++ parser3/src/classes/date.C 2002/04/16 08:59:25 1.26 @@ -1,10 +1,10 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: date.C,v 1.12 2001/11/05 11:46:20 paf Exp $ + $Id: date.C,v 1.26 2002/04/16 08:59:25 paf Exp $ */ #include "classes.h" @@ -31,20 +31,29 @@ 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 void _set(Request& r, const String& method_name, MethodParams *params) { +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) { // ^set(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); @@ -54,20 +63,20 @@ static void _set(Request& r, const Strin year-=1900; tmIn.tm_year=year; 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 *) { @@ -76,14 +85,13 @@ static void _sql_string(Request& r, cons 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(); - size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", gmtime(&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); - Value& result=*new(pool) VString(string); - r.write_assign_lang(result); + r.write_assign_lang(string); } @@ -100,27 +108,58 @@ 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 tIn=vdate->get_time(); - tm *tmIn=localtime(&tIn); - tmIn->tm_year+=oyear; - time_t t=mktime(tmIn); + time_t self_time=vdate->get_time(); + tm tmIn=*localtime(&self_time); + tm tmSaved=tmIn; + + 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, + throw Exception(0, + &method_name, + "bad resulting time (after roll)"); + if(oday==0 && tmIn.tm_mday!=tmSaved.tm_mday) + throw Exception(0, &method_name, - "invalid datetime"); - t+=omonth*getMonthDays(tmIn->tm_year, (tmIn->tm_mon+(omonth<0?-1:0)+12)%12)*SECS_PER_DAY; - t+=oday*SECS_PER_DAY; - vdate->set_time(t); + "bad resulting time (day hole)", t); + + tm *tmOut=localtime(&t); + if(!tmOut) + 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/*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, + &method_name, + "bad resulting time (after reconstruction)"); + + vdate->set_time(t); + } } static Table *fill_month_days(Request& r, @@ -134,7 +173,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); @@ -165,6 +204,10 @@ 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); @@ -174,7 +217,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); @@ -216,7 +259,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"); @@ -238,10 +281,11 @@ MDate::MDate(Pool& apool) : Methoded(apo // ^now[] - add_native_method("now", Method::CT_DYNAMIC, _now, 0, 0); + add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); // ^set(float days) - add_native_method("set", Method::CT_DYNAMIC, _set, 1, 6); + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6); + add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6); // ^sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0);