--- parser3/src/classes/date.C	2002/03/26 08:51:00	1.20
+++ parser3/src/classes/date.C	2002/03/28 14:26:48	1.23
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: date.C,v 1.20 2002/03/26 08:51:00 paf Exp $
+	$Id: date.C,v 1.23 2002/03/28 14:26:48 paf Exp $
 */
 
 #include "classes.h"
@@ -31,19 +31,24 @@ public: // Methoded
 
 // methods
 
-static void _now(Request& r, const String& method_name, MethodParams *) {
+static void _now(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VDate *vdate=static_cast<VDate *>(r.self);
-	vdate->set_time(time(0));
+
+	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);
+	
+	vdate->set_time(t);
 }
 
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VDate *vdate=static_cast<VDate *>(r.self);
 
-	time_t time;
+	time_t t;
 	if(params->size()==1) // ^set(float days)
-		time=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY);
+		t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY);
 	else if(params->size()>=3) { // ^set(y;m;d[;h[;m[;s]]])
 		tm tmIn={0};
 		tmIn.tm_isdst=-1;
@@ -58,16 +63,16 @@ static void _create(Request& r, const St
 		if(params->size()>3) tmIn.tm_hour=params->as_int(3, "hour must be int", r);
 		if(params->size()>4) tmIn.tm_min=params->as_int(4, "minutes must be int", r);
 		if(params->size()>5) tmIn.tm_sec=params->as_int(5, "seconds must be int", r);
-		time=mktime(&tmIn);
-		if(time<0)
-			throw Exception(0, 0,
+		t=mktime(&tmIn);
+		if(t<0)
+			throw Exception(0,
 				&method_name,
 				"invalid datetime");
 	} else
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"invalid params count, must be 1 or >=3");
-	vdate->set_time(time);
+	vdate->set_time(t);
 }
 
 static void _sql_string(Request& r, const String& method_name, MethodParams *) {
@@ -100,30 +105,31 @@ static void _roll(Request& r, const Stri
 	else if(what=="month") offset=&omonth;
 	else if(what=="day") offset=&oday;
 	else
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&what,
 			"must be year|month|day");
 	
 	*offset=params->as_int(1, "offset must be int", r);
-	if(!(*offset==1 || *offset==-1))
-		throw Exception(0, 0,
-			&method_name,
-			"offset must be +/- 1");
 
 	time_t self_time=vdate->get_time();
 	tm tmIn=*localtime(&self_time);
-	// we will preserve daytime from day-light-saving shifts across roll
 	tm tmSaved=tmIn;
-	tmIn.tm_hour=24/2; tmIn.tm_min=tmIn.tm_sec=0;
 
-    tmIn.tm_year+=oyear;
-    time_t t=mktime(&tmIn);
-    t+=omonth*getMonthDays(tmIn.tm_year, (tmIn.tm_mon+(omonth<0?-1:0)+12)%12)*SECS_PER_DAY;
-    t+=oday*SECS_PER_DAY;
-    
+	tmIn.tm_year+=oyear;
+	tmIn.tm_mon+=omonth;
+	tmIn.tm_mday+=oday;
+	tmIn.tm_hour=24/2; 
+	tmIn.tm_min=0;
+	tmIn.tm_sec=0;
+	time_t t=mktime/*normalizetime*/(&tmIn);
+	if(t<0)
+		throw Exception(0,
+		&method_name,
+		"bad resulting time (after roll)");
+
     tm *tmOut=localtime(&t);
 	if(!tmOut)
-		throw Exception(0, 0,
+		throw Exception(0,
 			&method_name,
 			"bad resulting time (seconds from epoch=%ld)", t);
     
@@ -132,11 +138,18 @@ static void _roll(Request& r, const Stri
     tmOut->tm_sec=tmSaved.tm_sec;
 	tmOut->tm_isdst=-1; 
 	{
-		time_t t=mktime(tmOut);
+		time_t t=mktime/*normalizetime*/(tmOut);
+		if(
+			tmOut->tm_hour!=tmSaved.tm_hour
+			||tmOut->tm_min!=tmSaved.tm_min)
+			throw Exception(0,
+				&method_name,
+				"bad resulting time (timeline hole)");
+
 		if(t<0)
-			throw Exception(0, 0,
-			&method_name,
-			"bad resulting time (after reconstruction)");
+			throw Exception(0,
+				&method_name,
+				"bad resulting time (after reconstruction)");
 		
 		vdate->set_time(t);
 	}
@@ -153,7 +166,7 @@ static Table *fill_month_days(Request& r
     tm tmIn={0, 0, 0, 1, month, year-1900};
     time_t t=mktime(&tmIn);
 	if(t<0)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"invalid date");
     tm *tmOut=localtime(&t);
@@ -197,7 +210,7 @@ static Table *fill_week_days(Request& r,
     tm tmIn={0, 0, 18, day, month, year-1900};
     time_t t=mktime(&tmIn);
 	if(t<0)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"invalid date");
     tm *tmOut=localtime(&t);
@@ -239,7 +252,7 @@ static void _calendar(Request& r, const
 	else if(what=="eng")
 		rus=false;
 	else
-		throw Exception(0, 0, 
+		throw Exception("parser.runtime", 
 			&what, 
 			"must be rus|eng");
 
@@ -261,7 +274,7 @@ MDate::MDate(Pool& apool) : Methoded(apo
 
 
 	// ^now[]
-	add_native_method("now", Method::CT_DYNAMIC, _now, 0, 0);
+	add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1);
 
 	// ^set(float days)
 	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6);