--- parser3/src/classes/date.C	2002/04/25 14:35:20	1.28
+++ parser3/src/classes/date.C	2002/08/05 13:15:11	1.35
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: date.C,v 1.28 2002/04/25 14:35:20 paf Exp $
 */
 
+static const char* IDENT_DATE_C="$Date: 2002/08/05 13:15:11 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vdouble.h"
@@ -53,23 +53,37 @@ static void _create(Request& r, const St
 
 	time_t t;
 	if(params->size()==1) { 
-		if(const String *sdate=params->get(0).get_string()) { // ^create[2002-04-25 18:14:00]
+		// ^create[2002-04-25 18:14:00]
+		// ^create[18:14:00]
+		if(const String *sdate=params->get(0).get_string()) {
 			char *cstr=sdate->cstr();
-			const char *year=lsplit(&cstr, '-');
-			const char *month=lsplit(&cstr, '-');
-			const char *mday=lsplit(&cstr, ' ');
-			const char *hour=lsplit(&cstr, ':');
-			const char *min=lsplit(&cstr, ':');
-			const char *sec=cstr;
-			if(!year)
-				throw Exception(0,
-					sdate,
-					"no part of date specified, must be in YYYY-NN-DD HH-MM-SS format");
+			char *cur=cstr;
+			const char *year=lsplit(&cur, '-');
+			const char *month=lsplit(&cur, '-');
+			const char *mday=lsplit(&cur, ' ');
+			if(!month)
+				cur=cstr;
+			const char *hour=lsplit(&cur, ':');
+			const char *min=lsplit(&cur, ':');
+			const char *sec=cur;
+
 			tm tmIn={0};
 			tmIn.tm_isdst=-1;
+			if(!month)
+				if(min) {
+					year=mday=0; // HH:MM
+					time_t t=time(0);
+					tm *tmNow=localtime(&t);
+					tmIn.tm_year=tmNow->tm_year;
+					tmIn.tm_mon=tmNow->tm_mon;
+					tmIn.tm_mday=tmNow->tm_mday;
+					goto date_part_set;
+				} else
+					hour=min=sec=0; // not YYYY- & not HH: = just YYYY					
 			tmIn.tm_year=NN_year_to_NNNN(atoi(year));
 			tmIn.tm_mon=month?atoi(month)-1:0;
 			tmIn.tm_mday=mday?atoi(mday):1;
+date_part_set:
 			tmIn.tm_hour=hour?atoi(hour):0;
 			tmIn.tm_min=min?atoi(min):0;
 			tmIn.tm_sec=sec?atoi(sec):0;
@@ -192,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;
@@ -212,15 +226,40 @@ 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;
+		// 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);
+
+				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[(tms.tm_year+1900) % 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;
+		}
     	*result+=&row;
     }
     
@@ -306,7 +345,7 @@ MDate::MDate(Pool& apool) : Methoded(apo
 	// ^now[]
 	add_native_method("now", Method::CT_DYNAMIC, _now, 0, 1);
 
-	// ^set(float days)
+	// ^create(float days)
 	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 6);
 	// old name for compatibility with <= v1.17 2002/2/18 12:13:42 paf
 	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 6);