--- parser3/src/classes/date.C	2005/03/23 08:50:04	1.69
+++ 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: 2005/03/23 08:50:04 $";
+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();
@@ -79,7 +79,7 @@ static int to_tm_year(int iyear) {
 			"empty string is not valid datetime");
 
 	char *cur=cstr;
-	int date_delim=isdigit((unsigned char)cur[0])&&isdigit((unsigned char)cur[1])&&isdigit((unsigned char)cur[2])&&isdigit((unsigned char)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);
@@ -131,7 +131,8 @@ static void _create(Request& r, MethodPa
 					"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));
@@ -142,17 +143,14 @@ static void _create(Request& r, MethodPa
 		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);
 		vdate.set_time(tmIn);
-	} else
-		throw Exception("parser.runtime",
-			0,
-			"invalid params count, must be 1 or >=2");
+	};
 }
 
 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];
-	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", vdate.get_localtime());
+	size=strftime(buf, size, "%Y-%m-%d %H:%M:%S", &vdate.get_localtime());
 	
 	r.write_assign_lang(String(buf, size));
 }
@@ -287,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));
 			}
 		
         }