--- parser3/src/classes/date.C 2008/02/14 10:11:16 1.78 +++ parser3/src/classes/date.C 2008/07/04 11:17:32 1.82 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DATE_C="$Date: 2008/02/14 10:11:16 $"; +static const char * const IDENT_DATE_C="$Date: 2008/07/04 11:17:32 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -127,12 +127,10 @@ 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, @@ -164,6 +162,14 @@ static void _sql_string(Request& r, Meth r.write_assign_lang(String(buf, size)); } +static void _gmt_string(Request& r, MethodParams&) { + VDate& vdate=GET_SELF(r, VDate); + + time_t when=vdate.get_time(); + + r.write_assign_lang(String(date_gmt_string(gmtime(&when)))); +} + static void _roll(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); @@ -406,25 +412,25 @@ static void _unix_timestamp(Request& r, } } -static void _lastday(Request& r, MethodParams& params) { +static void _last_day(Request& r, MethodParams& params) { int year; int month; if(&r.get_self() == date_class) { - // ^date:lastday(year;month) - if(params.count() == 2) { - 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 + 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_assign_lang(*new VInt(getMonthDays(year, month))); + r.write_no_lang(*new VInt(getMonthDays(year, month))); } @@ -442,9 +448,12 @@ MDate::MDate(): Methoded("date") { // ^date.sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0); + // ^date.gmt-string[] + add_native_method("gmt-string", Method::CT_DYNAMIC, _gmt_string, 0, 0); + // ^date:lastday(year;month) // ^date.lastday[] - add_native_method("lastday", Method::CT_ANY, _lastday, 0, 2); + 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);