--- parser3/src/classes/date.C 2016/03/29 10:18:54 1.101 +++ parser3/src/classes/date.C 2020/12/15 17:10:27 1.112 @@ -1,7 +1,7 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,7 +13,7 @@ #include "pa_vdate.h" #include "pa_vtable.h" -volatile const char * IDENT_DATE_C="$Id: date.C,v 1.101 2016/03/29 10:18:54 moko Exp $" IDENT_PA_VDATE_H; +volatile const char * IDENT_DATE_C="$Id: date.C,v 1.112 2020/12/15 17:10:27 moko Exp $" IDENT_PA_VDATE_H; // class @@ -27,7 +27,7 @@ public: // global variable -DECLARE_CLASS_VAR(date, new MDate, 0); +DECLARE_CLASS_VAR(date, new MDate); // helpers @@ -70,7 +70,7 @@ static void _today(Request& r, MethodPar vdate.set_tm(today); } -static int to_year(int iyear) { +int to_year(int iyear) { if(iyear<0 || iyear>9999) throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "year '%d' is out of range 0..9999", iyear); return iyear-1900; @@ -188,7 +188,7 @@ tm cstr_to_time_t(char *cstr, const char char *cur=cstr; const char *year, *month, *mday; - const char *hour, *min, *sec, *msec; + const char *hour, *min, *sec, *msec PA_ATTR_UNUSED; year=skip_number(&cur, "-:", &delim); if(delim != ':' || delim == ':' && strlen(year) >=4 ){ @@ -235,9 +235,9 @@ tm cstr_to_time_t(char *cstr, const char tmIn.tm_mday=tmNow->tm_mday; } - tmIn.tm_hour=hour?pa_atoi(hour):0; - tmIn.tm_min=min?pa_atoi(min):0; - tmIn.tm_sec=sec?pa_atoi(sec):0; + tmIn.tm_hour=pa_atoi(hour); + tmIn.tm_min=pa_atoi(min); + tmIn.tm_sec=pa_atoi(sec); //tmIn.tm_[msec<(adate)->get_tz()); vdate.set_time(round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY)); } - } else { // ^create(y;m;d[;h[;m[;s]]]) - assert(params.count()<=6); + } else { // ^create(y;m;d[;h[;m[;s[;TZ]]]]) tm tmIn; memset(&tmIn, 0, sizeof(tmIn)); tmIn.tm_isdst=-1; tmIn.tm_year=to_year(params.as_int(0, "year must be int", r)); @@ -266,6 +267,7 @@ static void _create(Request& r, MethodPa if(params.count()>3) tmIn.tm_hour=params.as_int(3, "hour must be int", r); if(params.count()>4) tmIn.tm_min=params.as_int(4, "minutes must be int", r); if(params.count()>5) tmIn.tm_sec=params.as_int(5, "seconds must be int", r); + if(params.count()>6) vdate.set_tz(params.as_string(6, "TZ must be string").cstr()); vdate.set_tm(tmIn); }; } @@ -286,13 +288,13 @@ static void _sql_string(Request& r, Meth throw Exception(PARSER_RUNTIME, &what, "'type' must be 'date', 'time' or 'datetime'"); } - r.write_assign_lang(*vdate.get_sql_string(format)); + r.write(*vdate.get_sql_string(format)); } static void _gmt_string(Request& r, MethodParams&) { VDate& vdate=GET_SELF(r, VDate); - r.write_assign_lang(*vdate.get_gmt_string()); + r.write(*vdate.get_gmt_string()); } static void _iso_string(Request& r, MethodParams& params) { @@ -304,17 +306,17 @@ static void _iso_string(Request& r, Meth if(HashStringValue* options=params.as_hash(0)){ int valid_options=0; if(Value* vshow_ms=options->get("ms")){ - if(r.process_to_value(*vshow_ms).as_bool()) + if(r.process(*vshow_ms).as_bool()) format=VDate::iso_string_type(format|VDate::iso_string_ms); valid_options++; } if(Value* vshow_colon=options->get("colon")){ - if(!r.process_to_value(*vshow_colon).as_bool()) + if(!r.process(*vshow_colon).as_bool()) format=VDate::iso_string_type(format|VDate::iso_string_no_colon); valid_options++; } if(Value* vshow_z=options->get("z")){ - if(!r.process_to_value(*vshow_z).as_bool()) + if(!r.process(*vshow_z).as_bool()) format=VDate::iso_string_type(format|VDate::iso_string_no_z); valid_options++; } @@ -322,7 +324,7 @@ static void _iso_string(Request& r, Meth throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - r.write_assign_lang(*vdate.get_iso_string(format)); + r.write(*vdate.get_iso_string(format)); } static void _roll(Request& r, MethodParams& params) { @@ -474,7 +476,7 @@ static Table& fill_week_days(Request& r, } static void _calendar(Request& r, MethodParams& params) { - const String& what=params.as_string(0, "format must be strig"); + const String& what=params.as_string(0, "format must be string"); bool rus=false; if(what=="rus") rus=true; @@ -489,7 +491,7 @@ static void _calendar(Request& r, Method else // 1+3 table=&fill_week_days(r, params, rus); - r.write_no_lang(*new VTable(table)); + r.write(*new VTable(table)); } static void _unix_timestamp(Request& r, MethodParams& params) { @@ -497,7 +499,7 @@ static void _unix_timestamp(Request& r, if(params.count()==0) { // ^date.unix-timestamp[] - r.write_no_lang(*new VDouble((double)vdate.get_time())); + r.write(*new VDouble((double)vdate.get_time())); } else { if(vdate.get_time()) throw Exception(PARSER_RUNTIME, 0, "date object already constructed"); @@ -520,7 +522,7 @@ static void _last_day(Request& r, Method // ^date.lastday[] tmIn=GET_SELF(r, VDate).get_tm(); } - r.write_no_lang(*new VInt(VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon))); + r.write(*new VInt(VDate::getMonthDays(tmIn.tm_year, tmIn.tm_mon))); } // constructor @@ -535,12 +537,12 @@ MDate::MDate(): Methoded("date") { // ^date::create(float days) // ^date::create[date] - // ^date::create(year;month;day[;hour[;minute[;sec]]]) + // ^date::create(year;month;day[;hour[;minute[;sec[;TZ]]]]) // ^date::create[yyyy-mm-dd[ hh:mm:ss]] // ^date::create[hh:mm:ss] - add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6); + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 7); // old name for compatibility with <= v1.17 2002/2/18 12:13:42 paf - add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6); + add_native_method("set", Method::CT_DYNAMIC, _create, 1, 7); // ^date.sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 1);