--- parser3/src/classes/date.C 2008/07/04 11:17:32 1.82 +++ parser3/src/classes/date.C 2009/05/13 07:36:04 1.84 @@ -1,11 +1,11 @@ /** @file Parser: @b date parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DATE_C="$Date: 2008/07/04 11:17:32 $"; +static const char * const IDENT_DATE_C="$Date: 2009/05/13 07:36:04 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -38,7 +38,8 @@ public: Date_calendar_table_template_columns(): ArrayString(6+2) { for(int i=0; i<=6; i++) { char *cname=new(PointerFreeGC) char[1/*strlen("6")*/+1/*terminating 0*/]; - *this+=new String(cname, sprintf(cname, "%d", i)); // .i column name + sprintf(cname, "%d", i); + *this+=new String(cname); // .i column name } *this+=new String("week"); *this+=new String("year"); @@ -63,7 +64,7 @@ static void _now(Request& r, MethodParam /// shrinked range: 1970/1/1 to 2038/1/1 static int to_year(int iyear) { if(iyear<1970 || iyear>2038) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "year '%d' is out of valid range", iyear); return iyear; @@ -83,7 +84,7 @@ static int to_tm_year(int iyear) { // 2002:04:25 [+maybe time] /*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) { if( !cstr || !*cstr ) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "empty string is not valid datetime"); @@ -133,7 +134,7 @@ static void _create(Request& r, MethodPa } 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, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid datetime"); vdate.set_time(t); @@ -159,7 +160,7 @@ static void _sql_string(Request& r, Meth char *buf=new(PointerFreeGC) char[size]; size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", &vdate.get_localtime()); - r.write_assign_lang(String(buf, size)); + r.write_assign_lang(String(buf)); } static void _gmt_string(Request& r, MethodParams&) { @@ -207,12 +208,12 @@ static void _roll(Request& r, MethodPara int saved_mon=(tmIn.tm_mon+12*100)%12; // crossing year boundary backwards t_changed_date=mktime/*normalizetime*/(&tmIn); if(t_changed_date<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (rolled out of valid date range)"); if(oday==0 && tmIn.tm_mon!=saved_mon/*but it changed*/) { if(adjust_day <= -3/*31->28 max, so never, but...*/) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (day hole still with %d day adjustment)", adjust_day ); @@ -224,7 +225,7 @@ static void _roll(Request& r, MethodPara tm *tmOut=localtime(&t_changed_date); if(!tmOut) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (seconds from epoch=%d)", t_changed_date); @@ -244,7 +245,7 @@ static void _roll(Request& r, MethodPara */ if(t_changed_time<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "bad resulting time (after reconstruction)"); @@ -267,7 +268,7 @@ static Table& fill_month_days(Request& r time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid date"); tm *tmOut=localtime(&t); @@ -281,7 +282,6 @@ static Table& fill_month_days(Request& r Table::element_type row(new ArrayString(7)); // calculating year week no [1..54] char *weekno_buf=0; // surely would be assigned to, but to calm down compiler - size_t weekno_size=0; // same int weekyear=0; // same // 0..6 week days-cells fill with month days for(int wday=0; wday<7; wday++, _day++) { @@ -290,7 +290,7 @@ static Table& fill_month_days(Request& r char *buf=new(PointerFreeGC) char[2+1]; cell->append_know_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN); } - *row+=cell; + *row+=cell; if(wday==(rus?3:4)/*thursday*/) { tm tms; @@ -306,16 +306,17 @@ static Table& fill_month_days(Request& r weekno_buf=new(PointerFreeGC) char[weekno_buf_size]; VDate::yw week = VDate::CalcWeek(tms); - weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", week.week); + snprintf(weekno_buf, weekno_buf_size, "%02d", week.week); } - } + } // appending year week no - *row+=new String(weekno_buf, weekno_size); + *row+=new String(weekno_buf); // appending year week year { - char* buf=new(PointerFreeGC) char[4+1]; - *row+=new String(buf, sprintf(buf, "%02d", weekyear)); + char* buf=new(PointerFreeGC) char[4+1]; + sprintf(buf, "%02d", weekyear); + *row+=new String(buf); } result+=row; } @@ -344,11 +345,11 @@ static Table& fill_week_days(Request& r, time_t t=mktime(&tmIn); if(t<0) - throw Exception(0, + throw Exception(DATE_RANGE_EXCEPTION_TYPE, 0, "invalid date"); tm *tmOut=localtime(&t); - + int baseWeekDay=tmOut->tm_wday; if(rus) baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last @@ -360,7 +361,8 @@ static Table& fill_week_days(Request& r, Table::element_type row(new ArrayString(4)); #define WDFILL(size, value) { \ char *buf=new(PointerFreeGC) char[size+1]; \ - *row+=new String(buf, sprintf(buf, "%0"#size"d", value)); \ + sprintf(buf, "%0"#size"d", value); \ + *row+=new String(buf); \ } WDFILL(4, 1900+tmOut->tm_year); WDFILL(2, 1+tmOut->tm_mon); @@ -401,7 +403,7 @@ static void _unix_timestamp(Request& r, r.write_no_lang(*new VInt((int)vdate.get_time())); } else { if(vdate.get_time()) - throw Exception(0, + throw Exception(PARSER_RUNTIME, 0, "date object already constructed");