--- parser3/src/classes/date.C	2005/08/26 12:36:58	1.72
+++ parser3/src/classes/date.C	2007/03/22 13:38:25	1.76
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_DATE_C="$Date: 2005/08/26 12:36:58 $";
+static const char * const IDENT_DATE_C="$Date: 2007/03/22 13:38:25 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -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,10 +143,7 @@ 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&) {
@@ -292,7 +290,8 @@ static Table& fill_month_days(Request& r
 				const int weekno_buf_size=2+1/*for stupid snprintfs*/ +1;
 
 				weekno_buf=new(PointerFreeGC) char[weekno_buf_size];
-				weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", VDate::week_no(tms));
+				VDate::yw week = VDate::CalcWeek(tms);
+				weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", week.week);
 			}
 		
         }