--- parser3/src/classes/table.C 2001/08/03 11:54:19 1.99 +++ parser3/src/classes/table.C 2001/12/15 21:28:18 1.136 @@ -2,14 +2,10 @@ Parser: @b table parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: table.C,v 1.136 2001/12/15 21:28:18 paf Exp $ */ -static const char *RCSId="$Id: table.C,v 1.99 2001/08/03 11:54:19 parser Exp $"; - -#include "pa_config_includes.h" - -#include "pcre.h" #include "classes.h" #include "pa_common.h" @@ -17,7 +13,6 @@ static const char *RCSId="$Id: table.C,v #include "pa_vtable.h" #include "pa_vint.h" #include "pa_sql_connection.h" -#include "pa_dir.h" #include "pa_vbool.h" // defines @@ -42,10 +37,9 @@ public: // Methoded static void _set(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter - Value& vdata=params->as_junction(params->size()-1, "body must be code"); - Temp_lang temp_lang(r, String::UL_PASS_APPENDED); - const String& data=r.process(vdata).as_string(); + const String& data= + r.process(params->as_junction(params->size()-1, "body must be code")).as_string(); size_t pos_after=0; // parse columns @@ -69,7 +63,7 @@ static void _set(Request& r, const Strin while(i.has_next()) { Array& row=*new(pool) Array(pool); const String& string=*i.next_string(); - // remove empty lines + // remove comment lines if(!string.size()) continue; @@ -84,11 +78,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; @@ -114,7 +108,8 @@ static void _load(Request& r, const Stri Table& table=*new(pool) Table(pool, &method_name, columns); char *row_chars; while(row_chars=getrow(&data)) { - if(!*row_chars) // remove empty lines + // remove empty&comment lines + if(!*row_chars || *row_chars == '#') continue; Array *row=new(pool) Array(pool); while(char *cell_chars=lsplit(&row_chars, '\t')) { @@ -122,7 +117,9 @@ static void _load(Request& r, const Stri cell->APPEND_TAINTED(cell_chars, 0, file, line); *row+=cell; } +#ifndef NO_STRING_ORIGIN line++; +#endif table+=row; }; @@ -130,129 +127,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, r); - int month=max(1, min(params->as_int(2, 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 *)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, r); - int month=max(1, min(params->as_int(2, r), 12)) -1; - int day=params->as_int(3, 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 *)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()); @@ -265,7 +150,7 @@ static void _save(Request& r, const Stri } else { // nameless table if(int lsize=table.size()?static_cast(table.get(0))->size():0) for(int column=0; columnas_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); @@ -288,8 +184,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 *) { @@ -310,8 +206,21 @@ static void _offset(Request& r, const St Pool& pool=r.pool(); Table& table=static_cast(r.self)->table(); if(params->size()) { - Value& offset_expr=params->as_junction(0, "offset must be expression"); - table.shift(r.process(offset_expr).as_int()); + bool absolute=false; + if(params->size()>1) { + const String& whence=params->as_string(0, "whence must be string"); + if(whence=="cur") + absolute=false; + else if(whence=="set") + absolute=true; + else + throw Exception(0, 0, + &whence, + "is invalid whence, valid are 'cur' or 'set'"); + } + + Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression"); + table.offset(absolute, r.process(offset_expr).as_int()); } else { Value& value=*new(pool) VInt(pool, table.current()); value.set_name(method_name); @@ -322,7 +231,7 @@ static void _offset(Request& r, const St static void _menu(Request& r, const String& method_name, MethodParams *params) { Value& body_code=params->as_junction(0, "body must be code"); - Value *delim_code=params->size()==2?¶ms->get(1):0; + Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; VTable& vtable=*static_cast(r.self); Table& table=vtable.table(); @@ -333,10 +242,10 @@ static void _menu(Request& r, const Stri table.set_current(row); Value& processed_body=r.process(body_code); - if(delim_code) { // delimiter set? + if(delim_maybe_code) { // delimiter set? const String *string=processed_body.get_string(); if(need_delim && string && string->size()) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_code)); + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -344,20 +253,14 @@ static void _menu(Request& r, const Stri table.set_current(saved_current); } -static void _empty(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - Table& table=static_cast(r.self)->table(); - - r.write_no_lang(*new(pool) VBool(pool, table.size()==0)); -} - -/// used by table: _hash / table_row_to_hash +#ifndef DOXYGEN struct Row_info { Table *table; int key_field; Array *value_fields; Hash *hash; }; +#endif static void table_row_to_hash(Array::Item *value, void *info) { Array& row=*static_cast(value); Row_info& ri=*static_cast(info); @@ -365,7 +268,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_field(r.self)->table(); + Table& self_table=static_cast(r.self)->table(); Value& result=*new(pool) VHash(pool); - if(const Array *columns=table.columns()) + if(const Array *columns=self_table.columns()) if(columns->size()>1) { - const String& key_field_name=params->as_no_junction(0, "key field name must not be code").as_string(); - int key_field=table.column_name2index(key_field_name, true); - int value_fields_count=params->size()-1; - bool value_fields_by_params=value_fields_count!=0; - if(!value_fields_by_params) - value_fields_count=columns->size()-1; // all columns except key - Array value_fields(pool, value_fields_count); - if(value_fields_by_params) { - for(int i=1; isize(); i++) { - const String& value_field_name=params->as_no_junction(i, - "value field name must not be code").as_string(); - value_fields+=table.column_name2index(value_field_name, true); - } - } else { // by all columns except key + int key_field=self_table.column_name2index(key_field_name, true); + + Array value_fields(pool); + if(params->size()>1) { + Value& value_fields_param=params->as_no_junction(1, "value field(s) must not be code"); + if(value_fields_param.is_string()) { + value_fields+=self_table.column_name2index(value_fields_param.as_string(), true); + } else if(Table *value_fields_table=value_fields_param.get_table()) { + for(int i=0; isize(); i++) { + const String& value_field_name= + *static_cast(value_fields_table->get(i))->get_string(0); + value_fields+=self_table.column_name2index(value_field_name, true); + } + } else + throw Exception(0, 0, + &method_name, + "value field(s) must be string or self_table" + ); + } else { // by all columns, including key for(int i=0; isize(); i++) - if(i!=key_field) - value_fields+=i; + value_fields+=i; } // integers: key_field & value_fields - Row_info row_info={&table, key_field, &value_fields, result.get_hash()}; - table.for_each(table_row_to_hash, &row_info); + Row_info row_info={&self_table, key_field, &value_fields, result.get_hash(0)}; + self_table.for_each(table_row_to_hash, &row_info); } result.set_name(method_name); r.write_no_lang(result); } -/// used by table: _sort / sort_cmp_string|sort_cmp_double +#ifndef DOXYGEN struct Table_seq_item { Array *row; union { @@ -420,6 +327,7 @@ struct Table_seq_item { double d; } value; }; +#endif static int sort_cmp_string(const void *a, const void *b) { return strcmp( static_cast(a)->value.c_str, @@ -437,27 +345,27 @@ static int sort_cmp_double(const void *a return 0; } static void _sort(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); Value& key_maker=params->as_junction(0, "key-maker must be code"); - bool reverse=params->size()==2/*..[asc|desc]*/? + bool reverse=params->size()>1/*..[desc|asc|]*/? reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": - false; + false; // default=asc - Table& table=static_cast(r.self)->table(); + Table& old_table=static_cast(r.self)->table(); + Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns()); - // anything to sort? - if(!table.size()) - return; - - Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size()); + Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size()); int i; // calculate key values bool key_values_are_strings=true; - for(i=0; i(r.self)->set_table(new_table); } static void _locate(Request& r, const String& method_name, MethodParams *params) { @@ -485,8 +395,9 @@ static void _locate(Request& r, const St VTable& vtable=*static_cast(r.self); Table& table=vtable.table(); Value& result=*new(pool) VBool(pool, table.locate( - params->get(0).as_string(), - params->get(1).as_string())); + params->as_string(0, "column name must be string"), + params->as_string(1, "value must be string") + )); result.set_name(method_name); r.write_no_lang(result); } @@ -503,7 +414,7 @@ static void _flip(Request& r, const Stri Array& new_row=*new(pool) Array(pool, old_table.size()); for(int i=0; ias_junction(0, "body must be code")).as_string(); @@ -530,14 +442,14 @@ static void _join(Request& r, const Stri Table *maybe_src=params->as_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"); @@ -567,7 +479,7 @@ public: statement_string(astatement_string), statement_cstr(astatement_cstr), columns(*new(pool) Array(pool)), - row(0), row_index(0), + row(0), table(0) { } @@ -590,7 +502,7 @@ public: if(size) cell->APPEND_TAINTED( (const char *)ptr, size, - statement_cstr, row_index++); + statement_cstr, table->size()-1); (*row)+=cell; } @@ -600,7 +512,6 @@ private: const String& statement_string; const char *statement_cstr; Array& columns; Array *row; - uint row_index; public: Table *table; }; @@ -609,22 +520,26 @@ 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"); Value& statement=params->as_junction(0, "statement must be code"); ulong limit=0; - if(params->size()>1) { - Value& limit_code=params->as_junction(1, "limit must be expression"); - limit=(uint)r.process(limit_code).as_double(); - } - ulong offset=0; - if(params->size()>2) { - Value& offset_code=params->as_junction(2, "offset must be expression"); - offset=(ulong)r.process(offset_code).as_double(); + 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(&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 + throw Exception(0, 0, + &method_name, + "options must be hash"); } Temp_lang temp_lang(r, String::UL_SQL); @@ -633,20 +548,32 @@ 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 { +#ifdef RESOURCES_DEBUG + struct timeval mt[2]; + //measure:before + gettimeofday(&mt[0],NULL); +#endif r.connection->query( statement_cstr, offset, limit, handlers); + +#ifdef RESOURCES_DEBUG + //measure:after connect + gettimeofday(&mt[1],NULL); + + double t[2]; + for(int i=0;i<2;i++) + t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; + + r.sql_request_time+=t[1]-t[0]; +#endif + } 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 @@ -656,81 +583,6 @@ static void _sql(Request& r, const Strin static_cast(r.self)->set_table(*result); } -static void _dir(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - Value& relative_path=params->as_no_junction(0, "path must not be code"); - - const String *regexp; - pcre *regexp_code; - int ovecsize; - int *ovector; - if(params->size()>1) { - regexp=¶ms->as_no_junction(1, "regexp must not be code").as_string(); - - const char *pattern=regexp->cstr(String::UL_AS_IS); - const char *errptr; - int erroffset; - regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, - &errptr, &erroffset, - r.pcre_tables); - - if(!regexp_code) - PTHROW(0, 0, - ®exp->mid(erroffset, regexp->size()), - "regular expression syntax error - %s", errptr); - - ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3)); - } else - regexp_code=0; - - - const char* absolute_path_cstr=r.absolute(relative_path.as_string()) - .cstr(String::UL_FILE_NAME); - - Array& columns=*new(pool) Array(pool); - columns+=new(pool) String(pool, "name"); - Table& table=*new(pool) Table(pool, &method_name, &columns); - - LOAD_DIR(absolute_path_cstr, - size_t file_name_size=strlen(ffblk.ff_name); - bool suits=true; - if(regexp_code) { - int exec_result=pcre_exec(regexp_code, 0, - ffblk.ff_name, file_name_size, 0, - 0, ovector, ovecsize); - - if(exec_result==PCRE_ERROR_NOMATCH) - suits=false; - else if(exec_result<0) { - (*pcre_free)(regexp_code); - PTHROW(0, 0, - regexp, - "regular expression execute (%d)", - exec_result); - } - } - - if(suits) { - char *file_name_cstr=(char *)r.malloc(file_name_size); - memcpy(file_name_cstr, ffblk.ff_name, file_name_size); - String &file_name=*new(pool) String(pool); - file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME, - method_name.origin().file, method_name.origin().line); - - Array& row=*new(pool) Array(pool); - row+=&file_name; - table+=&row; - } - ); - - if(regexp_code) - (*pcre_free)(regexp_code); - - // replace any previous table value - static_cast(r.self)->set_table(table); -} - static void _columns(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); @@ -766,10 +618,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); @@ -781,22 +629,20 @@ MTable::MTable(Pool& apool) : Methoded(a add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0); // ^table.offset[] - // ^table.offset[offset] - add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1); + // ^table.offset(offset) + // ^table.offset[cur|set](offset) + add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 2); // ^table.menu{code} // ^table.menu{code}[delim] add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2); - // ^table.empty[] - add_native_method("empty", Method::CT_DYNAMIC, _empty, 0, 0); - // ^table:hash[key field name] - // ^table:hash[key field name][value field name;...] - add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000); + // ^table:hash[key field name][value field name(s) string/table] + add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 2); - // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc] - // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc] + // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] + // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc] add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2); // ^table.locate[field;value] @@ -812,12 +658,9 @@ MTable::MTable(Pool& apool) : Methoded(a add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1); - // ^table:sql[query][(count[;offset])] - add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); - - // ^table:dir[path] - // ^table:dir[path][regexp] - add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2); + // ^table:sql[query] + // ^table:sql[query][$.limit(1) $.offset(2)] + add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); // ^table:columns[] add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);