--- parser3/src/classes/table.C 2001/08/03 11:54:19 1.99 +++ parser3/src/classes/table.C 2001/09/07 12:46:19 1.111 @@ -5,19 +5,15 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -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" +static const char *RCSId="$Id: table.C,v 1.111 2001/09/07 12:46:19 parser Exp $"; #include "classes.h" +#include "pa_config_includes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vtable.h" #include "pa_vint.h" #include "pa_sql_connection.h" -#include "pa_dir.h" #include "pa_vbool.h" // defines @@ -84,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, + const String& filename=params->as_string(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(filename)); // parse columns Array *columns; @@ -122,7 +118,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; }; @@ -156,7 +154,7 @@ static Table *fill_month_days(Request& r 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); + char *buf=(char *)pool.malloc(2+1); cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), method_name.origin().file, method_name.origin().line); } @@ -200,7 +198,7 @@ static Table *fill_week_days(Request& r, tm *tmOut=localtime(&t); Array& row=*new(pool) Array(pool, 4); #define WDFILL(size, value) { \ - char *buf=(char *)malloc(size+1); \ + 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, \ @@ -265,7 +263,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; column(value); Row_info& ri=*static_cast(info); @@ -412,7 +411,7 @@ static void _hash(Request& r, const Stri 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 +419,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 +437,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()==2/*..[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; ias_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()) { + 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, + &method_name, + "options must be hash"); } Temp_lang temp_lang(r, String::UL_SQL); @@ -634,7 +639,7 @@ static void _sql(Request& r, const Strin Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); bool need_rethrow=false; Exception rethrow_me; - PTRY { + PTRY { r.connection->query( statement_cstr, offset, limit, handlers); @@ -656,81 +661,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(); @@ -795,8 +725,8 @@ MTable::MTable(Pool& apool) : Methoded(a // ^table:hash[key field name][value field name;...] add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000); - // ^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 +742,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);