--- parser3/src/classes/table.C 2001/04/02 15:59:06 1.43 +++ parser3/src/classes/table.C 2001/04/04 06:16:18 1.49 @@ -1,11 +1,11 @@ /** @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.49 2001/04/04 06:16:18 paf Exp $ */ #include "pa_config_includes.h" @@ -20,34 +20,61 @@ 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, Array *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=static_cast(params->get(params->size()-1)); + // forcing {this body type} + r.fail_if_junction_(false, *vdata, method_name, "body must be junction"); + + 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, Array *params) { + Pool& pool=r.pool(); + // filename is last parameter + Value *vfilename=static_cast(params->get(params->size()-1)); + // forcing [this file name type] + r.fail_if_junction_(true, *vfilename, + method_name, "file name must not be junction"); + + // loading text + char *data=file_read_text(pool, r.absolute(vfilename->as_string())); + // parse columns Array *columns; #ifndef NO_STRING_ORIGIN @@ -63,7 +90,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 +104,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,26 +114,14 @@ 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) { Pool& pool=r.pool(); Value *vtable_name=static_cast(params->get(params->size()-1)); - // forcing - // ^save[this body type] + // forcing 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); - Table& table=static_cast(r.self)->table(); String sdata(pool); @@ -145,7 +160,8 @@ 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 *) { @@ -353,27 +369,18 @@ 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) { 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"); + // forcing {this body type} + r.fail_if_junction_(false, *value, method_name, "body must be junction"); - const String& string=static_cast(value)->as_string(); + const String& string=r.process(*value).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; } @@ -387,14 +394,14 @@ static void _join(Request& r, const Stri Table *maybe_src=value->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 +421,61 @@ static void _join(Request& r, const Stri } } +// ^table:sql{query}[(count[;offset])] +static void _sql(Request& r, const String& method_name, Array *params) { + Pool& pool=r.pool(); + + if(!r.connection) + PTHROW(0, 0, + &method_name, + "without connect"); + + Value& query=*static_cast(params->get(0)); + // forcing {this query param type} + r.fail_if_junction_(false, query, method_name, "query must be junction"); + + int count=0; + if(params->size()>1) { + Value& count_code=*static_cast(params->get(1)); + // forcing (this count param type) + r.fail_if_junction_(false, count_code, method_name, "count must be expression"); + count=(int)r.process(count_code).as_double(); + } + + int limit=0; + if(params->size()>2) { + Value& limit_code=*static_cast(params->get(2)); + // forcing (this limit param type) + r.fail_if_junction_(false, limit_code, method_name, "limit must be expression"); + limit=(int)r.process(limit_code).as_double(); + } + + Table& table=*new(pool) Table(pool, &method_name, 0); + Array& row=*new(pool) Array(pool); + + Temp_lang temp_lang(r, String::UL_SQL); + char *buf=(char *)malloc(MAX_STRING); + snprintf(buf, MAX_STRING, "[sql %s,%s,%d,%d]", + r.connection->cstr(), + r.process(query).as_string().cstr(), + count, + limit); + row+=new(pool) String(pool, buf); + table+=&row; + + // 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 +521,8 @@ 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); }