--- parser3/src/classes/date.C 2016/03/31 21:46:19 1.103 +++ parser3/src/classes/date.C 2016/10/25 23:37:52 1.107 @@ -13,7 +13,7 @@ #include "pa_vdate.h" #include "pa_vtable.h" -volatile const char * IDENT_DATE_C="$Id: date.C,v 1.103 2016/03/31 21:46:19 moko Exp $" IDENT_PA_VDATE_H; +volatile const char * IDENT_DATE_C="$Id: date.C,v 1.107 2016/10/25 23:37:52 moko Exp $" IDENT_PA_VDATE_H; // class @@ -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; @@ -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_pass_lang(*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_pass_lang(*vdate.get_gmt_string()); } static void _iso_string(Request& r, MethodParams& params) { @@ -306,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++; } @@ -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_pass_lang(*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;