--- parser3/src/classes/date.C 2002/08/08 14:35:30 1.36 +++ parser3/src/classes/date.C 2002/10/08 06:57:04 1.40 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DATE_C="$Date: 2002/08/08 14:35:30 $"; +static const char* IDENT_DATE_C="$Date: 2002/10/08 06:57:04 $"; #include "classes.h" #include "pa_request.h" @@ -29,11 +29,11 @@ public: // Methoded static void _now(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); time_t t=time(0); if(params->size()==1) // ^now(offset) - t+=(time_t)(params->as_double(0, "offset must be double", r)*SECS_PER_DAY); + t+=(time_t)round(params->as_double(0, "offset must be double", r)*SECS_PER_DAY); vdate->set_time(t); } @@ -49,7 +49,7 @@ static int NN_year_to_NNNN(int year) { /// @test 09 ok? [octal maybe] static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); time_t t; if(params->size()==1) { @@ -93,13 +93,13 @@ date_part_set: sdate, "invalid datetime"); } else { // ^create(float days) - t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY); + 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, &method_name, "invalid datetime"); } - } else if(params->size()>=2) { // ^set(y;m;d[;h[;m[;s]]]) + } else if(params->size()>=2) { // ^create(y;m;d[;h[;m[;s]]]) tm tmIn={0}; tmIn.tm_isdst=-1; tmIn.tm_year=NN_year_to_NNNN(params->as_int(0, "year must be int", r)); @@ -122,7 +122,7 @@ date_part_set: static void _sql_string(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); int size=1+ 4+1+2+1+2 +1+ 2+1+2+1+2 +1 +1; char *buf=(char *)pool.malloc(size); time_t time=vdate->get_time(); @@ -138,7 +138,7 @@ static void _sql_string(Request& r, cons static void _roll(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VDate *vdate=static_cast(r.self); + VDate *vdate=static_cast(r.get_self()); const String& what=params->as_string(0, "'what' must be string"); int oyear=0;