--- parser3/src/classes/date.C 2003/07/24 11:31:19 1.46 +++ parser3/src/classes/date.C 2003/10/30 13:16:53 1.48 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DATE_C="$Date: 2003/07/24 11:31:19 $"; +static const char* IDENT_DATE_C="$Date: 2003/10/30 13:16:53 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -71,7 +71,14 @@ static int NN_year_to_NNNN(int year) { // 2002-04-25 18:14:00 // 18:14:00 // 2002:04:25 [+maybe time] -time_t cstr_to_time_t(char *cstr, bool fail_on_error) { // used in image.C +/*not static, used in image.C*/ time_t cstr_to_time_t(char *cstr, bool fail_on_error) { + if( !cstr || !*cstr ) { + if(fail_on_error) + throw Exception(0, + 0, + "empty string is not valid datetime"); + return 0; + } char *cur=cstr; int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':' :'-'; @@ -161,7 +168,6 @@ static void _sql_string(Request& r, Meth r.write_assign_lang(String(buf, size)); } - static void _roll(Request& r, MethodParams& params) { VDate& vdate=GET_SELF(r, VDate); @@ -173,10 +179,14 @@ static void _roll(Request& r, MethodPara if(what=="year") offset=&oyear; else if(what=="month") offset=&omonth; else if(what=="day") offset=&oday; - else + else if(what=="TZ") { + const String& argument_tz=params.as_string(1, "'TZ' must be string"); + vdate.set_tz(&argument_tz); + return; + } else throw Exception("parser.runtime", &what, - "must be year|month|day"); + "must be year|month|day|TZ"); *offset=params.as_int(1, "offset must be int", r);