--- parser3/src/classes/date.C 2016/10/04 13:23:45 1.105 +++ parser3/src/classes/date.C 2017/02/07 22:00:26 1.110 @@ -1,7 +1,7 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 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.105 2016/10/04 13:23:45 moko Exp $" IDENT_PA_VDATE_H; +volatile const char * IDENT_DATE_C="$Id: date.C,v 1.110 2017/02/07 22:00:26 moko Exp $" IDENT_PA_VDATE_H; // class @@ -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 ){ @@ -288,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) { @@ -324,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) { @@ -476,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; @@ -491,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) { @@ -499,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"); @@ -522,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