--- parser3/src/classes/date.C 2007/03/22 13:38:25 1.76 +++ parser3/src/classes/date.C 2010/09/16 23:29:41 1.88 @@ -1,11 +1,11 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DATE_C="$Date: 2007/03/22 13:38:25 $"; +static const char * const IDENT_DATE_C="$Date: 2010/09/16 23:29:41 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -19,7 +19,7 @@ static const char * const IDENT_DATE_C=" class MDate: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue&) { return new VDate(0); } + Value* create_new_value(Pool&) { return new VDate(0); } public: MDate(); @@ -36,10 +36,9 @@ DECLARE_CLASS_VAR(date, new MDate, 0); 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 - } + for(int i=0; i<=6; i++) + *this+=new String(i, "%d"); // .i column name + *this+=new String("week"); *this+=new String("year"); } @@ -61,20 +60,29 @@ static void _now(Request& r, MethodParam } /// shrinked range: 1970/1/1 to 2038/1/1 -static int to_tm_year(int iyear) { +static int to_year(int iyear) { if(iyear<1970 || iyear>2038) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "year '%d' is out of valid range", iyear); - return iyear-1900; + return iyear; +} + +static int to_month(int imonth) { + return max(1, min(imonth, 12)) -1; } +static int to_tm_year(int iyear) { + return to_year(iyear)-1900; +} + + // 2002-04-25 18:14:00 // 18:14:00 // 2002:04:25 [+maybe time] /*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) { if( !cstr || !*cstr ) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "empty string is not valid datetime"); @@ -118,15 +126,13 @@ date_part_set: static void _create(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); - if(params.count()==1) { - // ^create[2002-04-25 18:14:00] - // ^create[18:14:00] - if(const String* sdate=params[0].get_string()) + if(params.count()==1){ + if(const String* sdate=params[0].get_string()){ // ^create[2002-04-25 18:14:00] ^create[18:14:00] vdate.set_time(cstr_to_time_t(sdate->cstrm())); - else { // ^create(float days) + } else { // ^create(float days) or ^create[date object] 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, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid datetime"); vdate.set_time(t); @@ -148,11 +154,14 @@ static void _create(Request& r, MethodPa 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(PointerFreeGC) char[size]; - size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", &vdate.get_localtime()); - - r.write_assign_lang(String(buf, size)); + + r.write_assign_lang(*vdate.get_sql_string()); +} + +static void _gmt_string(Request& r, MethodParams&) { + VDate& vdate=GET_SELF(r, VDate); + + r.write_assign_lang(*vdate.get_gmt_string()); } static void _roll(Request& r, MethodParams& params) { @@ -171,7 +180,7 @@ static void _roll(Request& r, MethodPara vdate.set_tz(&argument_tz); return; } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &what, "must be year|month|day|TZ"); @@ -192,12 +201,12 @@ static void _roll(Request& r, MethodPara 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, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 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, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (day hole still with %d day adjustment)", adjust_day ); @@ -209,7 +218,7 @@ static void _roll(Request& r, MethodPara tm *tmOut=localtime(&t_changed_date); if(!tmOut) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (seconds from epoch=%d)", t_changed_date); @@ -229,7 +238,7 @@ static void _roll(Request& r, MethodPara */ if(t_changed_time<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (after reconstruction)"); @@ -241,8 +250,8 @@ static Table& fill_month_days(Request& r 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; + int year=to_year(params.as_int(1, "year must be int", r)); + int month=to_month(params.as_int(2, "month must be int", r)); tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); @@ -252,7 +261,7 @@ static Table& fill_month_days(Request& r time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid date"); tm *tmOut=localtime(&t); @@ -265,17 +274,11 @@ 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=0; // surely would be assigned to, but to calm down compiler - size_t weekno_size=0; // same - int weekyear=0; // same + int weekyear=0; // surely would be assigned to, but to calm down compiler + int weekno=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(PointerFreeGC) char[2+1]; - cell->append_know_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN); - } - *row+=cell; + *row+=(_day>=1 && _day<=monthDays)?new String(_day, "%02d"):new String(); if(wday==(rus?3:4)/*thursday*/) { tm tms; @@ -286,22 +289,15 @@ static Table& fill_month_days(Request& r /*normalize*/mktime(&tms); weekyear=tms.tm_year+1900; - - const int weekno_buf_size=2+1/*for stupid snprintfs*/ +1; - - weekno_buf=new(PointerFreeGC) char[weekno_buf_size]; - VDate::yw week = VDate::CalcWeek(tms); - weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", week.week); + weekno=VDate::CalcWeek(tms).week; } - - } - // appending year week no - *row+=new String(weekno_buf, weekno_size); - // appending year week year - { - char* buf=new(PointerFreeGC) char[4+1]; - *row+=new String(buf, sprintf(buf, "%02d", weekyear)); } + // appending week no + *row+=new String(weekno, "%02d"); + + // appending week year + *row+=new String(weekyear, "%04d"); + result+=row; } @@ -316,8 +312,8 @@ 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 year=to_year(params.as_int(1, "year must be int", r)); + int month=to_month(params.as_int(2, "month must be int", r)); int day=params.as_int(3, "day must be int", r); tm tmIn; @@ -329,11 +325,11 @@ static Table& fill_week_days(Request& r, time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid date"); tm *tmOut=localtime(&t); - + int baseWeekDay=tmOut->tm_wday; if(rus) baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last @@ -343,14 +339,12 @@ static Table& fill_week_days(Request& r, 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=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); + + *row+=new String(1900+tmOut->tm_year, "%04d"); + *row+=new String(1+tmOut->tm_mon, "%02d"); + *row+=new String(tmOut->tm_mday, "%02d"); + *row+=new String(tmOut->tm_wday, "%02d"); + result+=row; } @@ -365,7 +359,7 @@ static void _calendar(Request& r, Method else if(what=="eng") rus=false; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &what, "must be rus|eng"); @@ -386,7 +380,7 @@ static void _unix_timestamp(Request& r, r.write_no_lang(*new VInt((int)vdate.get_time())); } else { if(vdate.get_time()) - throw Exception(0, + throw Exception(PARSER_RUNTIME, 0, "date object already constructed"); @@ -397,22 +391,50 @@ static void _unix_timestamp(Request& r, } } +static void _last_day(Request& r, MethodParams& params) { + int year; + int month; + if(&r.get_self() == date_class) { + if(params.count() != 2) + throw Exception(PARSER_RUNTIME, + 0, + "year and month must be defined"); + + // ^date:lastday(year;month) + year=to_year(params.as_int(0, "year must be int", r)); + month=to_month(params.as_int(1, "month must be int", r)); + } else { + // ^date.lastday[] + tm &tmIn=GET_SELF(r, VDate).get_localtime(); + year=tmIn.tm_year+1900; + month=tmIn.tm_mon; + } + r.write_no_lang(*new VInt(getMonthDays(year, month))); +} + // constructor MDate::MDate(): Methoded("date") { - // ^now[] + // ^date::now[] add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); - // ^create(float days) + // ^date::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[] + // ^date.sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0); - // ^roll(year|month|day;+/- 1) + // ^date.gmt-string[] + add_native_method("gmt-string", Method::CT_DYNAMIC, _gmt_string, 0, 0); + + // ^date:lastday(year;month) + // ^date.lastday[] + add_native_method("last-day", Method::CT_ANY, _last_day, 0, 2); + + // ^date.roll(year|month|day;+/- 1) add_native_method("roll", Method::CT_DYNAMIC, _roll, 2, 2); // ^date:calendar[month|montheng;year;month] = table @@ -420,6 +442,7 @@ MDate::MDate(): Methoded("date") { add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4); - // ^unix-timestamp[] + // ^date.unix-timestamp[] + // ^date::unix-timestamp[] add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1); }