--- parser3/src/classes/date.C	2003/10/30 12:46:23	1.47
+++ parser3/src/classes/date.C	2003/11/07 13:59:21	1.52
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DATE_C="$Date: 2003/10/30 12:46:23 $";
+static const char* IDENT_DATE_C="$Date: 2003/11/07 13:59:21 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -19,7 +19,7 @@ static const char* IDENT_DATE_C="$Date:
 
 class MDate: public Methoded {
 public: // VStateless_class
-	Value* create_new_value() { return new VDate(0); }
+	Value* create_new_value(Pool& apool) { return new VDate(0); }
 
 public:
 	MDate();
@@ -168,7 +168,6 @@ static void _sql_string(Request& r, Meth
 	r.write_assign_lang(String(buf, size));
 }
 
-
 static void _roll(Request& r, MethodParams& params) {
 	VDate& vdate=GET_SELF(r, VDate);
 
@@ -180,10 +179,14 @@ static void _roll(Request& r, MethodPara
 	if(what=="year") offset=&oyear;
 	else if(what=="month") offset=&omonth;
 	else if(what=="day") offset=&oday;
-	else
+	else if(what=="TZ") {
+		const String& argument_tz=params.as_string(1, "'TZ' must be string");
+		vdate.set_tz(&argument_tz);
+		return;
+	} else
 		throw Exception("parser.runtime",
 			&what,
-			"must be year|month|day");
+			"must be year|month|day|TZ");
 	
 	*offset=params.as_int(1, "offset must be int", r);
 
@@ -375,6 +378,26 @@ static void _calendar(Request& r, Method
 	r.write_no_lang(*new VTable(table));
 }
 
+static void _unix_timestamp(Request& r, MethodParams& params) {
+	VDate& vdate=GET_SELF(r, VDate);
+
+	if(params.count()==0) { 
+		// ^date.unix-timestamp[]
+		r.write_no_lang(*new VInt((int)vdate.get_time()));
+	} else {
+		if(vdate.get_time())
+			throw Exception(0,
+				0,
+				"date object already constructed");
+
+		// ^unix-timestamp(time_t)
+		time_t t=(time_t)params.as_int(0, "Unix timestamp must be integer", r);
+
+		vdate.set_time(t);
+	}
+}
+
+
 // constructor
 
 MDate::MDate(): Methoded("date") {
@@ -396,4 +419,7 @@ MDate::MDate(): Methoded("date") {
 	// ^date:calendar[week|weekeng;year;month;day] = table
 	add_native_method("calendar", Method::CT_STATIC, _calendar, 3, 4);
 
+
+	// ^unix-timestamp[]
+	add_native_method("unix-timestamp", Method::CT_DYNAMIC, _unix_timestamp, 0, 1);
 }