--- parser3/src/classes/date.C	2001/10/09 13:17:45	1.10
+++ parser3/src/classes/date.C	2002/03/26 08:51:00	1.20
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b date parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	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.10 2001/10/09 13:17:45 parser Exp $
+	$Id: date.C,v 1.20 2002/03/26 08:51:00 paf Exp $
 */
 
 #include "classes.h"
@@ -37,7 +37,7 @@ static void _now(Request& r, const Strin
 	vdate->set_time(time(0));
 }
 
-static void _set(Request& r, const String& method_name, MethodParams *params) {
+static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VDate *vdate=static_cast<VDate *>(r.self);
 
@@ -60,11 +60,11 @@ static void _set(Request& r, const Strin
 		if(params->size()>5) tmIn.tm_sec=params->as_int(5, "seconds must be int", r);
 		time=mktime(&tmIn);
 		if(time<0)
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&method_name,
 				"invalid datetime");
 	} else
-		PTHROW(0, 0,
+		throw Exception(0, 0,
 			&method_name,
 			"invalid params count, must be 1 or >=3");
 	vdate->set_time(time);
@@ -76,7 +76,7 @@ static void _sql_string(Request& r, cons
 	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();
-	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", gmtime(&time));
+	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", localtime(&time));
 	
 	String& string=*new(pool) String(pool);
 	string.APPEND_CLEAN(buf, size, 
@@ -100,27 +100,46 @@ static void _roll(Request& r, const Stri
 	else if(what=="month") offset=&omonth;
 	else if(what=="day") offset=&oday;
 	else
-		PTHROW(0, 0,
+		throw Exception(0, 0,
 			&what,
 			"must be year|month|day");
 	
 	*offset=params->as_int(1, "offset must be int", r);
 	if(!(*offset==1 || *offset==-1))
-		PTHROW(0, 0,
+		throw Exception(0, 0,
 			&method_name,
 			"offset must be +/- 1");
 
-	time_t tIn=vdate->get_time();
-    tm *tmIn=localtime(&tIn);
-	tmIn->tm_year+=oyear;
-	time_t t=mktime(tmIn);
-	if(t<0)
-		PTHROW(0, 0,
-			&method_name,
-			"invalid datetime");
-	t+=omonth*getMonthDays(tmIn->tm_year, (tmIn->tm_mon+(omonth<0?-1:0)+12)%12)*SECS_PER_DAY;
+	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;
-	vdate->set_time(t);
+    
+    tm *tmOut=localtime(&t);
+	if(!tmOut)
+		throw Exception(0, 0,
+			&method_name,
+			"bad resulting time (seconds from epoch=%ld)", t);
+    
+    tmOut->tm_hour=tmSaved.tm_hour;
+    tmOut->tm_min=tmSaved.tm_min;
+    tmOut->tm_sec=tmSaved.tm_sec;
+	tmOut->tm_isdst=-1; 
+	{
+		time_t t=mktime(tmOut);
+		if(t<0)
+			throw Exception(0, 0,
+			&method_name,
+			"bad resulting time (after reconstruction)");
+		
+		vdate->set_time(t);
+	}
 }
 
 static Table *fill_month_days(Request& r, 
@@ -134,7 +153,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)
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			&method_name, 
 			"invalid date");
     tm *tmOut=localtime(&t);
@@ -165,6 +184,10 @@ static Table *fill_week_days(Request& r,
 							 const String& method_name, MethodParams *params, bool rus){
 	Pool& pool=r.pool();
 	Array& columns=*new(pool) Array(pool, 4);
+	columns+=new(pool) String(pool, "year");
+	columns+=new(pool) String(pool, "month");
+	columns+=new(pool) String(pool, "day");
+	columns+=new(pool) String(pool, "weekday");
 	Table *result=new(pool) Table(pool, &method_name, &columns);
 
     int year=params->as_int(1, "year must be int", r);
@@ -174,7 +197,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)
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			&method_name, 
 			"invalid date");
     tm *tmOut=localtime(&t);
@@ -216,7 +239,7 @@ static void _calendar(Request& r, const
 	else if(what=="eng")
 		rus=false;
 	else
-		PTHROW(0, 0, 
+		throw Exception(0, 0, 
 			&what, 
 			"must be rus|eng");
 
@@ -241,7 +264,8 @@ MDate::MDate(Pool& apool) : Methoded(apo
 	add_native_method("now", Method::CT_DYNAMIC, _now, 0, 0);
 
 	// ^set(float days)
-	add_native_method("set", Method::CT_DYNAMIC, _set, 1, 6);
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6);
+	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6);
 
 	// ^sql-string[]
 	add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0);