--- parser3/src/classes/date.C 2002/04/25 14:35:20 1.28 +++ parser3/src/classes/date.C 2002/08/01 11:26:43 1.32 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: date.C,v 1.28 2002/04/25 14:35:20 paf Exp $ */ +static const char* IDENT_DATE_C="$Id: date.C,v 1.32 2002/08/01 11:26:43 paf Exp $"; + #include "classes.h" #include "pa_request.h" #include "pa_vdouble.h" @@ -53,23 +53,37 @@ static void _create(Request& r, const St time_t t; if(params->size()==1) { - if(const String *sdate=params->get(0).get_string()) { // ^create[2002-04-25 18:14:00] + // ^create[2002-04-25 18:14:00] + // ^create[18:14:00] + if(const String *sdate=params->get(0).get_string()) { char *cstr=sdate->cstr(); - const char *year=lsplit(&cstr, '-'); - const char *month=lsplit(&cstr, '-'); - const char *mday=lsplit(&cstr, ' '); - const char *hour=lsplit(&cstr, ':'); - const char *min=lsplit(&cstr, ':'); - const char *sec=cstr; - if(!year) - throw Exception(0, - sdate, - "no part of date specified, must be in YYYY-NN-DD HH-MM-SS format"); + char *cur=cstr; + const char *year=lsplit(&cur, '-'); + const char *month=lsplit(&cur, '-'); + const char *mday=lsplit(&cur, ' '); + if(!month) + cur=cstr; + const char *hour=lsplit(&cur, ':'); + const char *min=lsplit(&cur, ':'); + const char *sec=cur; + tm tmIn={0}; tmIn.tm_isdst=-1; + if(!month) + if(min) { + year=mday=0; // HH:MM + time_t t=time(0); + tm *tmNow=localtime(&t); + tmIn.tm_year=tmNow->tm_year; + tmIn.tm_mon=tmNow->tm_mon; + tmIn.tm_mday=tmNow->tm_mday; + goto date_part_set; + } else + hour=min=sec=0; // not YYYY- & not HH: = just YYYY tmIn.tm_year=NN_year_to_NNNN(atoi(year)); tmIn.tm_mon=month?atoi(month)-1:0; tmIn.tm_mday=mday?atoi(mday):1; +date_part_set: tmIn.tm_hour=hour?atoi(hour):0; tmIn.tm_min=min?atoi(min):0; tmIn.tm_sec=sec?atoi(sec):0; @@ -306,7 +320,7 @@ MDate::MDate(Pool& apool) : Methoded(apo // ^now[] add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1); - // ^set(float days) + // ^create(float days) add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6); // old name for compatibility with <= v1.17 2002/2/18 12:13:42 paf add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6);