--- parser3/src/classes/date.C	2004/02/19 15:25:10	1.64
+++ parser3/src/classes/date.C	2006/11/17 09:31:16	1.74
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b date parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_DATE_C="$Date: 2004/02/19 15:25:10 $";
+static const char * const IDENT_DATE_C="$Date: 2006/11/17 09:31:16 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -19,7 +19,7 @@ static const char * const IDENT_DATE_C="
 
 class MDate: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&) { return new VDate(0); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VDate(0); }
 
 public:
 	MDate();
@@ -72,14 +72,14 @@ static int to_tm_year(int iyear) {
 // 2002-04-25 18:14:00
 // 18:14:00
 // 2002:04:25 [+maybe time]
-/*not static, used in image.C*/ time_t cstr_to_time_t(char *cstr) {
+/*not static, used in image.C*/ tm cstr_to_time_t(char *cstr) {
 	if( !cstr || !*cstr )
 		throw Exception(0,
 			0,
 			"empty string is not valid datetime");
 
 	char *cur=cstr;
-	int date_delim=isdigit(cur[0])&&isdigit(cur[1])&&isdigit(cur[2])&&isdigit(cur[3])&&cur[4]==':'?':'
+	char date_delim=isdigit((unsigned char)cur[0])&&isdigit((unsigned char)cur[1])&&isdigit((unsigned char)cur[2])&&isdigit((unsigned char)cur[3])&&cur[4]==':'?':'
 		:'-';
 	const char* year=lsplit(&cur, date_delim);
 	const char* month=lsplit(&cur, date_delim);
@@ -88,7 +88,8 @@ static int to_tm_year(int iyear) {
 		cur=cstr;
 	const char* hour=lsplit(&cur, ':');
 	const char* min=lsplit(&cur, ':');
-	const char* sec=cur;
+	const char* sec=lsplit(&cur, '.');
+	const char* msec=cur;
 
 	tm tmIn;  memset(&tmIn, 0, sizeof(tmIn));
 	tmIn.tm_isdst=-1;
@@ -102,44 +103,36 @@ static int to_tm_year(int iyear) {
 			tmIn.tm_mday=tmNow->tm_mday;
 			goto date_part_set;
 		} else
-			hour=min=sec=0; // not YYYY- & not HH: = just YYYY					
+			hour=min=sec=msec=0; // not YYYY- & not HH: = just YYYY					
 	tmIn.tm_year=to_tm_year(pa_atoi(year));
 	tmIn.tm_mon=month?pa_atoi(month)-1:0;
 	tmIn.tm_mday=mday?pa_atoi(mday):1;
 date_part_set:
-	int savedHour=tmIn.tm_hour=hour?pa_atoi(hour):0;
+	tmIn.tm_hour=hour?pa_atoi(hour):0;
 	tmIn.tm_min=min?pa_atoi(min):0;
 	tmIn.tm_sec=sec?pa_atoi(sec):0;	
-	time_t result=mktime(&tmIn);
-	if(tmIn.tm_hour!=savedHour)
-		throw Exception(0,
-			0, //report_error_origin,
-			"invalid datetime: spring daylightsaving hour hole");
-	if(result<0)
-		throw Exception(0,
-			0, //report_error_origin,
-			"invalid datetime");
-
-	return result;
+	//tmIn.tm_[msec<<no such, waits reimplementation of the class]=f(msec);
+	return tmIn;
 }
 
 static void _create(Request& r, MethodParams& params) {
 	VDate& vdate=GET_SELF(r, VDate);
 
-	time_t t;
 	if(params.count()==1) { 
 		// ^create[2002-04-25 18:14:00]
 		// ^create[18:14:00]
 		if(const String* sdate=params[0].get_string())
-			t=cstr_to_time_t(sdate->cstrm());
+			vdate.set_time(cstr_to_time_t(sdate->cstrm()));
 		else { // ^create(float days)
-			t=(time_t)round(params.as_double(0, "float days must be double", r)*SECS_PER_DAY);
+			time_t 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,
 					0,
 					"invalid datetime");
+			vdate.set_time(t);
 		}
-	} else if(params.count()>=2) { // ^create(y;m;d[;h[;m[;s]]])
+	} else { // ^create(y;m;d[;h[;m[;s]]])
+		assert(params.count()>6);
 		tm tmIn; memset(&tmIn, 0, sizeof(tmIn));
 		tmIn.tm_isdst=-1;
 		tmIn.tm_year=to_tm_year(params.as_int(0, "year must be int", r));
@@ -149,28 +142,15 @@ static void _create(Request& r, MethodPa
 		if(params.count()>3) savedHour=tmIn.tm_hour=params.as_int(3, "hour must be int", r);
 		if(params.count()>4) tmIn.tm_min=params.as_int(4, "minutes must be int", r);
 		if(params.count()>5) tmIn.tm_sec=params.as_int(5, "seconds must be int", r);
-		t=mktime(&tmIn);
-		if(tmIn.tm_hour!=savedHour)
-			throw Exception(0,
-				0, //report_error_origin,
-				"invalid datetime: spring daylightsaving hour hole");
-		if(t<0)
-			throw Exception(0,
-				0,
-				"invalid datetime");
-	} else
-		throw Exception("parser.runtime",
-			0,
-			"invalid params count, must be 1 or >=2");
-	vdate.set_time(t);
+		vdate.set_time(tmIn);
+	};
 }
 
 static void _sql_string(Request& r, MethodParams&) {
 	VDate& vdate=GET_SELF(r, VDate);
 	int size=1+ 4+1+2+1+2 +1+ 2+1+2+1+2 +1 +1;
 	char *buf=new(PointerFreeGC) char[size];
-	time_t time=vdate.get_time();
-	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", localtime(&time));
+	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", &vdate.get_localtime());
 	
 	r.write_assign_lang(String(buf, size));
 }
@@ -305,16 +285,12 @@ static Table& fill_month_days(Request& r
 				tms.tm_year=year-1900;
 				
 				/*normalize*/mktime(&tms);
-
 				weekyear=tms.tm_year+1900;
 
 				const int weekno_buf_size=2+1/*for stupid snprintfs*/ +1;
 
-				// http://www.merlyn.demon.co.uk/weekinfo.htm
-				const int FirstThurs[] = {7,5,4,3,2,7,6,5,4,2,1,7,6,4,3,2,1,6,5,4,3,1,7,6,5,3,2,1};
-				int n=1 + (tms.tm_yday-(FirstThurs[weekyear % 28]-3))/7;
 				weekno_buf=new(PointerFreeGC) char[weekno_buf_size];
-				weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n);
+				weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", VDate::week_no(tms));
 			}
 		
         }