--- parser3/src/classes/date.C	2002/08/01 11:26:43	1.32
+++ parser3/src/classes/date.C	2002/09/23 09:50:18	1.39
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DATE_C="$Id: date.C,v 1.32 2002/08/01 11:26:43 paf Exp $";
+static const char* IDENT_DATE_C="$Date: 2002/09/23 09:50:18 $";
 
 #include "classes.h"
 #include "pa_request.h"
@@ -29,11 +29,11 @@ public: // Methoded
 
 static void _now(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 
 	time_t t=time(0);
 	if(params->size()==1) // ^now(offset)
-		t+=(time_t)(params->as_double(0, "offset must be double", r)*SECS_PER_DAY);
+		t+=(time_t)round(params->as_double(0, "offset must be double", r)*SECS_PER_DAY);
 	
 	vdate->set_time(t);
 }
@@ -49,7 +49,7 @@ static int NN_year_to_NNNN(int year) {
 /// @test 09 ok? [octal maybe]
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 
 	time_t t;
 	if(params->size()==1) { 
@@ -93,7 +93,7 @@ date_part_set:
 					sdate,
 					"invalid datetime");
 		} else { // ^create(float days)
-			t=(time_t)(params->as_double(0, "float days must be double", r)*SECS_PER_DAY);
+			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,
 					&method_name,
@@ -122,7 +122,7 @@ date_part_set:
 
 static void _sql_string(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 	int size=1+ 4+1+2+1+2 +1+ 2+1+2+1+2 +1 +1;
 	char *buf=(char *)pool.malloc(size);
 	time_t time=vdate->get_time();
@@ -138,7 +138,7 @@ static void _sql_string(Request& r, cons
 
 static void _roll(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDate *vdate=static_cast<VDate *>(r.self);
+	VDate *vdate=static_cast<VDate *>(r.get_self());
 
 	const String& what=params->as_string(0, "'what' must be string");
     int oyear=0;
@@ -206,7 +206,7 @@ static void _roll(Request& r, const Stri
 static Table *fill_month_days(Request& r, 
 							  const String& method_name, MethodParams *params, bool rus){
 	Pool& pool=r.pool();
-	Table *result=new(pool) Table(pool, &method_name, 0/*&columns*/);
+	Table *result=new(pool) Table(pool, *date_calendar_table_template);
 
     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;
@@ -226,15 +226,51 @@ static Table *fill_month_days(Request& r
     
     for(int _day=1-weekDay1; _day<=monthDays;) {
 		Array& row=*new(pool) Array(pool, 7);
+		// calculating year week no [1..54]
+		char *weekno_buf;
+		size_t weekno_size;
+		int weekyear;
+		// 0..6 week days-cells fill with month days
     	for(int wday=0; wday<7; wday++, _day++) {
-        	String *cell=new(pool) String(pool);
+			String *cell=new(pool) String(pool);
 			if(_day>=1 && _day<=monthDays) {
 				char *buf=(char *)pool.malloc(2+1); 
 				cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), 
 					method_name.origin().file, method_name.origin().line);
             }
 			row+=cell;            
+
+			if(wday==(rus?3:4)/*thursday*/) {
+				tm tms={0,0,0,  _day, month, 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=(char *)pool.malloc(weekno_buf_size);
+				weekno_size=snprintf(weekno_buf, weekno_buf_size, "%02d", n);
+			}
+		
         }
+		// appending year week no
+		{
+        	String *cell=new(pool) String(pool);
+			cell->APPEND_CLEAN(weekno_buf, weekno_size, 
+				method_name.origin().file, method_name.origin().line);
+			row+=cell;
+		}
+		// appending year week year
+		{
+        	String *cell=new(pool) String(pool);
+			char *buf=(char *)pool.malloc(4+1); 
+			cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", weekyear), 
+				method_name.origin().file, method_name.origin().line);
+			row+=cell;
+		}
     	*result+=&row;
     }