--- parser3/src/classes/table.C 2001/10/09 12:49:01 1.123 +++ parser3/src/classes/table.C 2001/10/31 14:08:36 1.129 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: table.C,v 1.123 2001/10/09 12:49:01 parser Exp $ + $Id: table.C,v 1.129 2001/10/31 14:08:36 paf Exp $ */ #include "classes.h" @@ -80,11 +80,11 @@ static void _set(Request& r, const Strin static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // filename is last parameter - Value& vfilename=params->as_no_junction(params->size()-1, + Value& vfile_name=params->as_no_junction(params->size()-1, "file name must not be code"); // loading text - char *data=file_read_text(pool, r.absolute(vfilename.as_string())); + char *data=file_read_text(pool, r.absolute(vfile_name.as_string())); // parse columns Array *columns; @@ -129,129 +129,17 @@ static void _load(Request& r, const Stri static_cast(r.self)->set_table(table); } -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*/); - - 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; - - tm tmIn={0, 0, 0, 1, month, year-1900}; - time_t t=mktime(&tmIn); - if(t<0) - PTHROW(0, 0, - &method_name, - "invalid date"); - tm *tmOut=localtime(&t); - - int weekDay1=tmOut->tm_wday; - if(rus) - weekDay1=weekDay1?weekDay1-1:6; //sunday last - int monthDays=getMonthDays(year, month); - - for(int _day=1-weekDay1; _day<=monthDays;) { - Array& row=*new(pool) Array(pool, 7); - for(int wday=0; wday<7; wday++, _day++) { - 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; - } - *result+=&row; - } - - return result; -} - -static Table *fill_week_days(Request& r, - const String& method_name, MethodParams *params, bool rus){ - Pool& pool=r.pool(); - Array& columns=*new(pool) Array(pool, 4); - columns+=new(pool) String(pool, "year"); - columns+=new(pool) String(pool, "month"); - columns+=new(pool) String(pool, "day"); - columns+=new(pool) String(pool, "weekday"); - Table *result=new(pool) Table(pool, &method_name, &columns); - - 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; - int day=params->as_int(3, "day must be int", r); - - tm tmIn={0, 0, 18, day, month, year-1900}; - time_t t=mktime(&tmIn); - if(t<0) - PTHROW(0, 0, - &method_name, - "invalid date"); - tm *tmOut=localtime(&t); - - int baseWeekDay=tmOut->tm_wday; - if(rus) - baseWeekDay=baseWeekDay?baseWeekDay-1:6; //sunday last - - t-=baseWeekDay*SECS_PER_DAY; - - for(int curWeekDay=0; curWeekDay<7; curWeekDay++, t+=SECS_PER_DAY) { - tm *tmOut=localtime(&t); - Array& row=*new(pool) Array(pool, 4); -#define WDFILL(size, value) { \ - char *buf=(char *)pool.malloc(size+1); \ - String *cell=new(pool) String(pool); \ - cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \ - method_name.origin().file, \ - method_name.origin().line); \ - row+=cell; \ - } - WDFILL(4, 1900+tmOut->tm_year); - WDFILL(2, 1+tmOut->tm_mon); - WDFILL(2, tmOut->tm_mday); - WDFILL(2, tmOut->tm_wday); - *result+=&row; - } - - return result; -} - -static void _calendar(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - const String& what=params->as_string(0, "format must be strig"); - bool rus=false; - if(what=="rus") - rus=true; - else if(what=="eng") - rus=false; - else - PTHROW(0, 0, - &what, - "must be rus|eng"); - - Table *result=0; - if(params->size()==1+2) - result=fill_month_days(r, method_name, params, rus); - else // 1+3 - result=fill_week_days(r, method_name, params, rus); - - // replace any previous table value - static_cast(r.self)->set_table(*result); -} - - - - +/// @todo "z\nz" "zzz""zz" static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vtable_name=params->as_no_junction(params->size()-1, + Value& vfile_name=params->as_no_junction(params->size()-1, "file name must not be code"); Table& table=static_cast(r.self)->table(); + bool do_append=false; String sdata(pool); - if(params->size()==1) { // not nameless=named output + if(params->size()==1) { // named output // write out names line if(table.columns()) { // named table Array_iter i(*table.columns()); @@ -272,6 +160,17 @@ static void _save(Request& r, const Stri sdata.APPEND_CONST("empty nameless table"); } sdata.APPEND_CONST("\n"); + } else { // mode specified + const String& mode=params->as_string(0, "mode must be string"); + if(mode=="append") + do_append=true; + else if(mode=="nameless") + /*ok, already skipped names output*/; + else + throw Exception(0, 0, + &mode, + "unknown mode, must be 'append'"); + } // data lines Array_iter i(table); @@ -287,8 +186,8 @@ static void _save(Request& r, const Stri } // write - file_write(pool, r.absolute(vtable_name.as_string()), - sdata.cstr(), sdata.size(), true); + file_write(pool, r.absolute(vfile_name.as_string()), + sdata.cstr(), sdata.size(), true, do_append); } static void _count(Request& r, const String& method_name, MethodParams *) { @@ -358,7 +257,7 @@ static void table_row_to_hash(Array::Ite if(ri.key_fieldsize(); i++) { int value_field=ri.value_fields->get_int(i); if(value_fieldas_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "source is not a table"); Table& src=*maybe_src; Table& dest=static_cast(r.self)->table(); if(&src == &dest) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "source and destination are same table"); @@ -610,7 +509,7 @@ static void _sql(Request& r, const Strin Pool& pool=r.pool(); if(!r.connection) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "without connect"); @@ -621,13 +520,13 @@ static void _sql(Request& r, const Strin if(params->size()>1) { Value& voptions=params->as_no_junction(1, "options must be hash, not code"); if(voptions.is_defined()) - if(Hash *options=voptions.get_hash()) { + if(Hash *options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) limit=(ulong)r.process(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) offset=(ulong)r.process(*voffset).as_double(); } else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "options must be hash"); } @@ -638,20 +537,16 @@ static void _sql(Request& r, const Strin statement_string.cstr(String::UL_UNSPECIFIED, r.connection); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); - bool need_rethrow=false; Exception rethrow_me; - PTRY { + try { r.connection->query( statement_cstr, offset, limit, handlers); + } catch(const Exception& e) { // query problem + // more specific source [were url] + throw Exception(e.type(), e.code(), + &statement_string, + "%s", e.comment()); } - PCATCH(e) { // query problem - rethrow_me=e; need_rethrow=true; - } - PEND_CATCH - if(need_rethrow) - PTHROW(rethrow_me.type(), rethrow_me.code(), - &statement_string, // setting more specific source [were url] - rethrow_me.comment()); Table *result= handlers.table?handlers.table: // query resulted in table? return it @@ -696,10 +591,6 @@ MTable::MTable(Pool& apool) : Methoded(a // ^table:load[nameless;file] add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); - // ^table:calendar[month|montheng;year;month] - // ^table:calendar[week|weekeng;year;month;day] - add_native_method("calendar", Method::CT_DYNAMIC, _calendar, 3, 4); - // ^table.save[file] // ^table.save[nameless;file] add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);