--- parser3/src/classes/date.C	2003/04/03 10:51:51	1.42.2.11.2.10
+++ parser3/src/classes/date.C	2003/11/20 17:09:35	1.56
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DATE_C="$Date: 2003/04/03 10:51:51 $";
+static const char * const IDENT_DATE_C="$Date: 2003/11/20 17:09:35 $";
 
 #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&) { return new VDate(0); }
 
 public:
 	MDate();
@@ -71,7 +71,14 @@ static int NN_year_to_NNNN(int year) {
 // 2002-04-25 18:14:00
 // 18:14:00
 // 2002:04:25 [+maybe time]
-time_t cstr_to_time_t(char *cstr, bool fail_on_error) { // used in image.C
+/*not static, used in image.C*/ time_t cstr_to_time_t(char *cstr, bool fail_on_error) {
+	if( !cstr || !*cstr ) {
+		if(fail_on_error)
+			throw Exception(0,
+				0,
+				"empty string is not valid datetime");
+		return 0;
+	}
 	char *cur=cstr;
 	int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':'
 		:'-';
@@ -84,7 +91,7 @@ time_t cstr_to_time_t(char *cstr, bool f
 	const char* min=lsplit(&cur, ':');
 	const char* sec=cur;
 
-	tm tmIn={0};
+	tm tmIn;  memset(&tmIn, 0, sizeof(tmIn));
 	tmIn.tm_isdst=-1;
 	if(!month)
 		if(min) {
@@ -131,7 +138,7 @@ static void _create(Request& r, MethodPa
 					"invalid datetime");
 		}
 	} else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]])
-		tm tmIn={0};
+		tm tmIn; memset(&tmIn, 0, sizeof(tmIn));
 		tmIn.tm_isdst=-1;
 		tmIn.tm_year=NN_year_to_NNNN(params.as_int(0, "year must be int", r));
 		tmIn.tm_mon=params.as_int(1, "month must be int", r)-1;
@@ -161,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);
 
@@ -173,68 +179,90 @@ 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);
 
 	time_t self_time=vdate.get_time();
 	tm tmIn=*localtime(&self_time);
 	tm tmSaved=tmIn;
+	int adjust_day=0;
+	time_t t_changed_date;
+	while(true) {
+		tmIn.tm_year+=oyear;
+		tmIn.tm_mon+=omonth;
+		tmIn.tm_mday+=oday+adjust_day;
+		tmIn.tm_hour=24/2; 
+		tmIn.tm_min=0;
+		tmIn.tm_sec=0;
+		int saved_mon=(tmIn.tm_mon+12*100)%12; // crossing year boundary backwards
+		t_changed_date=mktime/*normalizetime*/(&tmIn);
+		if(t_changed_date<0)
+			throw Exception(0,
+				0,
+				"bad resulting time (rolled out of valid date range)");
+		if(oday==0 && tmIn.tm_mon!=saved_mon/*but it changed*/) {
+			if(adjust_day <= -3/*31->28 max, so never, but...*/)
+				throw Exception(0,
+					0,
+					"bad resulting time (day hole still with %d day adjustment)", adjust_day );
+			
+			tmIn=tmSaved; // restoring
+			--adjust_day; //retrying with prev day
+		} else
+			break;			
+	}
 
-	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,
-			0,
-			"bad resulting time (after roll)");
-	if(oday==0 && tmIn.tm_mday!=tmSaved.tm_mday)
-		throw Exception(0,
-			0,
-			"bad resulting time (day hole)", t);
-
-    tm *tmOut=localtime(&t);
+	tm *tmOut=localtime(&t_changed_date);
 	if(!tmOut)
 		throw Exception(0,
 			0,
-			"bad resulting time (seconds from epoch=%ld)", t);
+			"bad resulting time (seconds from epoch=%d)", t_changed_date);
     
-    tmOut->tm_hour=tmSaved.tm_hour;
-    tmOut->tm_min=tmSaved.tm_min;
-    tmOut->tm_sec=tmSaved.tm_sec;
+	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/*normalizetime*/(tmOut);
+		time_t t_changed_time=mktime/*normalizetime*/(tmOut);
+		/*autofix: in msk timezone last sunday of april hour hole: [2am->3am)
 		if(
 			tmOut->tm_hour!=tmSaved.tm_hour
 			||tmOut->tm_min!=tmSaved.tm_min)
 			throw Exception(0,
 				0,
 				"bad resulting time (hour hole)");
+		*/
 
-		if(t<0)
+		if(t_changed_time<0)
 			throw Exception(0,
 				0,
 				"bad resulting time (after reconstruction)");
 		
-		vdate.set_time(t);
+		vdate.set_time(t_changed_time);
 	}
 }
 
 static Table& fill_month_days(Request& r, MethodParams& params, bool rus){
-	Table& result=*new Table(date_calendar_table_template);
+	Table::Action_options table_options;
+	Table& result=*new Table(date_calendar_table_template, table_options);
 	
 	int year=params.as_int(1, "year must be int", r);
 	int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1;
 	
-	tm tmIn={0, 0, 0, 1, month, year-1900};
+	tm tmIn;  
+	memset(&tmIn, 0, sizeof(tmIn)); 
+	tmIn.tm_mday=1;
+	tmIn.tm_mon=month; 
+	tmIn.tm_yday=year-1900;
+
 	time_t t=mktime(&tmIn);
 	if(t<0)
 		throw Exception(0, 
@@ -250,15 +278,15 @@ static Table& fill_month_days(Request& r
 	for(int _day=1-weekDay1; _day<=monthDays;) {
 		Table::element_type row(new ArrayString(7));
 		// calculating year week no [1..54]
-		char *weekno_buf;
-		size_t weekno_size;
-		int weekyear;
+		char *weekno_buf=0; // surely would be assigned to, but to calm down compiler
+		size_t weekno_size=0; // same
+		int weekyear=0; // same
 		// 0..6 week days-cells fill with month days
 		for(int wday=0; wday<7; wday++, _day++) {
 			String* cell=new String;
 			if(_day>=1 && _day<=monthDays) {
 				char *buf=new(PointerFreeGC) char[2+1]; 
-				cell->append_help_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN);
+				cell->append_know_length(buf, sprintf(buf, "%02d", _day), String::L_CLEAN);
 			}
 			*row+=cell;            
 
@@ -303,7 +331,13 @@ static Table& fill_week_days(Request& r,
 	int month=max(1, min(params.as_int(2, "month must be int", r), 12)) -1;
 	int day=params.as_int(3, "day must be int", r);
 	
-	tm tmIn={0, 0, 18, day, month, year-1900};
+	tm tmIn;
+	memset(&tmIn, 0, sizeof(tmIn)); 
+	tmIn.tm_hour=18;
+	tmIn.tm_mday=day;
+	tmIn.tm_mon=month; 
+	tmIn.tm_yday=year-1900;
+		
 	time_t t=mktime(&tmIn);
 	if(t<0)
 		throw Exception(0, 
@@ -355,6 +389,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") {
@@ -376,4 +430,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);
 }