--- parser3/src/classes/date.C	2002/08/08 14:35:30	1.36
+++ parser3/src/classes/date.C	2003/01/21 15:51:06	1.42
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b date parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DATE_C="$Date: 2002/08/08 14:35:30 $";
+static const char* IDENT_DATE_C="$Date: 2003/01/21 15:51:06 $";
 
 #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<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(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);
 }
@@ -46,60 +46,70 @@ static int NN_year_to_NNNN(int year) {
 	return year;
 }
 
-/// @test 09 ok? [octal maybe]
+// 2002-04-25 18:14:00
+// 18:14:00
+// 2002:04:25 [+maybe time]
+time_t cstr_to_time_t(char *cstr, const String *report_error_origin) { // used in image.C
+	char *cur=cstr;
+	int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':'
+		:'-';
+	const char *year=lsplit(&cur, date_delim);
+	const char *month=lsplit(&cur, date_delim);
+	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;
+	time_t result=mktime(&tmIn);
+	if(result<0)
+		if(report_error_origin)
+			throw Exception(0,
+				report_error_origin,
+				"invalid datetime");
+
+	return result;
+}
+
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 
 	time_t t;
 	if(params->size()==1) { 
 		// ^create[2002-04-25 18:14:00]
 		// ^create[18:14:00]
-		if(const String *sdate=params->get(0).get_string()) {
-			char *cstr=sdate->cstr();
-			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;
-			t=mktime(&tmIn);
-			if(t<0)
-				throw Exception(0,
-					sdate,
-					"invalid datetime");
-		} else { // ^create(float days)
-			t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY);
+		if(const String *sdate=params->get(0).get_string())
+			t=cstr_to_time_t(sdate->cstr(), sdate);
+		else { // ^create(float days)
+			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 +132,7 @@ date_part_set:
 
 static void _sql_string(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(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 +148,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<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 
 	const String& what=params->as_string(0, "'what' must be string");
     int oyear=0;