--- parser3/src/classes/table.C 2001/04/02 15:59:06 1.43 +++ parser3/src/classes/table.C 2001/04/23 10:58:27 1.64 @@ -1,53 +1,81 @@ /** @file - Parser: table parser class. + Parser: @b table parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: table.C,v 1.43 2001/04/02 15:59:06 paf Exp $ + $Id: table.C,v 1.64 2001/04/23 10:58:27 paf Exp $ */ #include "pa_config_includes.h" + +#include "pcre.h" + #include "pa_common.h" #include "pa_request.h" #include "_table.h" #include "pa_vtable.h" #include "pa_vint.h" +#include "pa_sql_connection.h" +#include "pa_dir.h" // global var VStateless_class *table_class; // methods -/// @test remove CONFIG untaint, make pos() searches in String -static void set_or_load( - Request& r, - const String& method_name, Array *params, - bool is_load) { +static void _set(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter - Value *vdata_or_filename=static_cast(params->get(params->size()-1)); - // forcing - // ^load[this file name type] - // ^set{this body type} - r.fail_if_junction_(is_load, *vdata_or_filename, - method_name, is_load?"file name must not be junction":"body must be junction"); - - // data or table_name - char *data; - if(is_load) { - // forcing untaint language - String ltable_name(pool); - ltable_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true); - // loading text - data=file_read_text(pool, r.absolute(ltable_name)); + Value& vdata=params->get_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(); + + size_t pos_after=0; + // parse columns + Array *columns; + if(params->size()==2) { + columns=0; } else { - // suggesting untaint language - Temp_lang temp_lang(r, String::UL_TABLE); - data=r.process(*vdata_or_filename).as_string().cstr(); + columns=new(pool) Array(pool); + + Array head(pool); + data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1); + if(head.size()) + head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN); } + Table& table=*new(pool) Table(pool, &method_name, columns); + // parse cells + Array rows(pool); + data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN); + int size=rows.quick_size(); + for(int i=0; i(r.self)->set_table(table); +} + +static void _load(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + // filename is last parameter + Value& vfilename=params->get_no_junction(params->size()-1, + "file name must not be code"); + + // loading text + char *data=file_read_text(pool, r.absolute(vfilename.as_string())); + // parse columns Array *columns; #ifndef NO_STRING_ORIGIN @@ -63,7 +91,7 @@ static void set_or_load( if(char *row_chars=getrow(&data)) do { String *name=new(pool) String(pool); - name->APPEND_CLEAN(lsplit(&row_chars, '\t'), 0, file, line++); + name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++); *columns+=name; } while(row_chars); } @@ -77,7 +105,7 @@ static void set_or_load( Array *row=new(pool) Array(pool); while(char *cell_chars=lsplit(&row_chars, '\t')) { String *cell=new(pool) String(pool); - cell->APPEND_CLEAN(cell_chars, 0, file, line); + cell->APPEND_TAINTED(cell_chars, 0, file, line); *row+=cell; } line++; @@ -87,25 +115,11 @@ static void set_or_load( // replace any previous table value static_cast(r.self)->set_table(table); } -static void _set(Request& r, const String& method_name, Array *params) { - set_or_load(r, method_name, params, false); -} -static void _load(Request& r, const String& method_name, Array *params) { - set_or_load(r, method_name, params, true); -} -static void _save(Request& r, const String& method_name, Array *params) { +static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value *vtable_name=static_cast(params->get(params->size()-1)); - // forcing - // ^save[this body type] - r.fail_if_junction_(true, *vtable_name, - method_name, "file name must not be junction"); - - // forcing untaint language - String ltable_name(pool); - ltable_name.append(vtable_name->as_string(), - String::UL_FILE_NAME, true); + Value& vtable_name=params->get_no_junction(params->size()-1, + "file name must not be code"); Table& table=static_cast(r.self)->table(); @@ -145,43 +159,42 @@ static void _save(Request& r, const Stri } // write - file_write(pool, r.absolute(ltable_name), sdata.cstr(), sdata.size(), true); + file_write(pool, r.absolute(vtable_name.as_string()), + sdata.cstr(), sdata.size(), true); } -static void _count(Request& r, const String&method_name, Array *) { +static void _count(Request& r, const String&, MethodParams *) { Pool& pool=r.pool(); Value& value=*new(pool) VInt(pool, static_cast(r.self)->table().size()); r.write_no_lang(value); } -static void _line(Request& r, const String& method_name, Array *) { +static void _line(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); Value& value=*new(pool) VInt(pool, 1+static_cast(r.self)->table().current()); r.write_no_lang(value); } -static void _offset(Request& r, const String& method_name, Array *params) { +static void _offset(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Table& table=static_cast(r.self)->table(); if(params->size()) - table.shift((int)r.process(*static_cast(params->get(0))).as_double()); + table.shift((int)r.process(params->get(0)).as_double()); else { Value& value=*new(pool) VInt(pool, table.current()); r.write_no_lang(value); } } -static void _menu(Request& r, const String& method_name, Array *params) { - Value& body_code=*static_cast(params->get(0)); - // forcing ^menu{this param type} - r.fail_if_junction_(false, body_code, - method_name, "body must be junction"); +static void _menu(Request& r, const String& method_name, MethodParams *params) { + Value& body_code=params->get_junction(0, "body must be code"); - Value *delim_code=params->size()==2?static_cast(params->get(1)):0; + Value *delim_code=params->size()==2?¶ms->get(1):0; - Table& table=static_cast(r.self)->table(); + VTable& vtable=*static_cast(r.self); + Table& table=vtable.table(); bool need_delim=false; - int saved_current=table.current(); + vtable.lock(); int saved_current=table.current(); for(int row=0; row(r.self)->table(); - if(table.size()==0) { - Value& value=r.process(*static_cast(params->get(0))); - r.write_pass_lang(value); - } else if(params->size()==2) { - Value& value=r.process(*static_cast(params->get(1))); - r.write_pass_lang(value); - } + if(table.size()==0) + r.write_pass_lang(r.process(params->get(0))); + else if(params->size()>1) + r.write_pass_lang(r.process(params->get(1))); } struct Record_info { @@ -224,7 +234,7 @@ static void store_column_item_to_hash(Ar value=new(*ri.pool) VUnknown(*ri.pool); ri.hash->put(column_name, value); } -static void _record(Request& r, const String& method_name, Array *params) { +static void _record(Request& r, const String& method_name, MethodParams *params) { Table& table=static_cast(r.self)->table(); if(const Array *columns=table.columns()) { Pool& pool=r.pool(); @@ -259,19 +269,12 @@ static int sort_cmp_double(const void *a else return 0; } -static void _sort(Request& r, const String& method_name, Array *params) { - Value& key_maker=*(Value *)params->get(0); - // forcing ^sort{this} ^sort(or this) param type - r.fail_if_junction_(false, key_maker, method_name, "key-maker must be junction"); - - bool reverse; - if(params->size()==2) { // ..[asc|desc] - Value& order=*(Value *)params->get(1); - // forcing ..[this param-type] - r.fail_if_junction_(true, order, method_name, "order must not be junction"); - reverse=order.as_string()=="desc"; - } else - reverse=false; +static void _sort(Request& r, const String& method_name, MethodParams *params) { + Value& key_maker=params->get_junction(0, "key-maker must be code"); + + bool reverse=params->size()==2/*..[asc|desc]*/? + reverse=params->get_no_junction(1, "order must not be code").as_string()=="desc": + false; Table& table=static_cast(r.self)->table(); @@ -287,7 +290,7 @@ static void _sort(Request& r, const Stri for(i=0; i(r.self); Table& table=vtable.table(); vtable.last_locate_was_successful=table.locate( - static_cast(params->get(0))->as_string(), - static_cast(params->get(1))->as_string()); + params->get(0).as_string(), + params->get(1).as_string()); } -static void _found(Request& r, const String& method_name, Array *params) { - if(static_cast(r.self)->last_locate_was_successful) { - Value& then_code=*static_cast(params->get(0)); - // forcing ^found{this param type} - r.fail_if_junction_(false, then_code, - method_name, "found-parameter must be junction"); - r.write_pass_lang(r.process(then_code)); - } else if(params->size()==2) { - Value& else_code=*static_cast(params->get(1)); - // forcing ^found{this param type} - r.fail_if_junction_(false, else_code, - method_name, "not found-parameter must be junction"); - r.write_pass_lang(r.process(else_code)); - } +static void _found(Request& r, const String& method_name, MethodParams *params) { + if(static_cast(r.self)->last_locate_was_successful) + r.write_pass_lang(r.process(params->get_junction(0, "found-parameter must be code"))); + else if(params->size()==2) + r.write_pass_lang(r.process(params->get_junction(0, "else-parameter must be code"))); } -static void _flip(Request& r, const String& method_name, Array *params) { +static void _flip(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VTable& vtable=*static_cast(r.self); @@ -353,48 +347,32 @@ static void _flip(Request& r, const Stri vtable.set_table(new_table); } -/// @test require \t to be clean [UL_NO] -static void _append(Request& r, const String& method_name, Array *params) { +static void _append(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter - Value *value=static_cast(params->get(0)); - // forcing [this body type] - r.fail_if_junction_(true, *value, method_name, "body must not be junction"); - - const String& string=static_cast(value)->as_string(); + const String& string= + r.process(params->get_junction(0, "body must be code")).as_string(); // parse cells Array& row=*new(pool) Array(pool); - size_t pos_after=0; - int pos_before; - while((pos_before=string.pos("\t", pos_after))>=0) { - row+=&string.piece(pos_after, pos_before); - pos_after=pos_before+1/*\t*/; - } - // last piece - if(pos_after(r.self)->table()+=&row; } -static void _join(Request& r, const String& method_name, Array *params) { +static void _join(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value *value=static_cast(params->get(0)); - // forcing [this table ref type] - r.fail_if_junction_(true, *value, method_name, "table ref must not be junction"); - - Table *maybe_src=value->get_table(); + Table *maybe_src=params->get_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - RTHROW(0, 0, + PTHROW(0, 0, &method_name, "source is not a table"); Table& src=*maybe_src; Table& dest=static_cast(r.self)->table(); if(&src == &dest) - RTHROW(0, 0, + PTHROW(0, 0, &method_name, "source and destination are same table"); @@ -414,15 +392,167 @@ static void _join(Request& r, const Stri } } -// initialize +/// ^table:sql{query}[(count[;offset])] +static void _sql(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + if(!r.connection) + PTHROW(0, 0, + &method_name, + "without connect"); + + Value& statement=params->get_junction(0, "statement must be code"); + + ulong limit=0; + if(params->size()>1) { + Value& limit_code=params->get_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->get_junction(2, "offset must be expression"); + offset=(ulong)r.process(offset_code).as_double(); + } + + Temp_lang temp_lang(r, String::UL_SQL); + const String& statement_string=r.process(statement).as_string(); + const char *statement_cstr= + statement_string.cstr(String::UL_UNSPECIFIED, r.connection); + unsigned int sql_column_count; SQL_Driver::Cell *sql_columns; + unsigned long sql_row_count; SQL_Driver::Cell **sql_rows; + bool need_rethrow=false; Exception rethrow_me; + PTRY { + r.connection->query( + statement_cstr, offset, limit, + &sql_column_count, &sql_columns, + &sql_row_count, &sql_rows); + } + PCATCH(e) { // connect/process 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()); + + Array& table_columns=*new(pool) Array(pool); + for(unsigned int i=0; i(r.self)->set_table(table); +} + +/// ^table:dir[path] +/// ^table:dir[path][regexp] +static void _dir(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& relative_path=params->get_no_junction(0, "path must not be code"); + + const String *regexp; + pcre *regexp_code; + int ovecsize; + int *ovector; + if(params->size()>1) { + regexp=¶ms->get_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_TAINTED(file_name_cstr, file_name_size, + 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); +} + +// initialize void initialize_table_class(Pool& pool, VStateless_class& vclass) { - // ^table.set{data} - // ^table.set[nameless]{data} + // ^table:set{data} + // ^table:set[nameless]{data} vclass.add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2); - // ^table.load[file] - // ^table.load[nameless;file] + // ^table:load[file] + // ^table:load[nameless;file] vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); // ^table.save[file] @@ -468,4 +598,12 @@ void initialize_table_class(Pool& pool, // ^table.join[table] vclass.add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1); + + + // ^table:sql[query][(count[;offset])] + vclass.add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); + + // ^table:dir[path] + // ^table:dir[path][regexp] + vclass.add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2); }