--- parser3/src/classes/table.C 2001/07/25 10:43:14 1.95 +++ parser3/src/classes/table.C 2001/08/07 13:54:13 1.100 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: table.C,v 1.95 2001/07/25 10:43:14 parser Exp $"; +static const char *RCSId="$Id: table.C,v 1.100 2001/08/07 13:54:13 parser Exp $"; #include "pa_config_includes.h" @@ -65,10 +65,10 @@ static void _set(Request& r, const Strin // parse cells Array rows(pool); data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN); - int size=rows.quick_size(); - for(int i=0; isize()==1) { // not nameless=named output // write out names line if(table.columns()) { // named table - for(int column=0; columnsize(); column++) { - if(column) - sdata.APPEND_CONST("\t"); - sdata.append(*static_cast(table.columns()->quick_get(column)), + Array_iter i(*table.columns()); + while(i.has_next()) { + sdata.append(*i.next_string(), //*static_cast(table.columns()->quick_get(column)), String::UL_TABLE); + if(i.has_next()) + sdata.APPEND_CONST("\t"); } } else { // nameless table - int lsize=table.size()?static_cast(table.get(0))->size():0; - if(lsize) + if(int lsize=table.size()?static_cast(table.get(0))->size():0) for(int column=0; column(table.quick_get(index)); - for(int column=0; columnsize(); column++) { - if(column) - sdata.APPEND_CONST("\t"); - sdata.append(*static_cast(row->quick_get(column)), + Array_iter i(table); + while(i.has_next()) { + Array_iter c(*static_cast(i.next())); + while(c.has_next()) { + sdata.append(*c.next_string(), //*static_cast(row->quick_get(column)), String::UL_TABLE); + if(c.has_next()) + sdata.APPEND_CONST("\t"); } sdata.APPEND_CONST("\n"); } @@ -326,8 +327,9 @@ static void _menu(Request& r, const Stri VTable& vtable=*static_cast(r.self); Table& table=vtable.table(); bool need_delim=false; - vtable.lock(); int saved_current=table.current(); - for(int row=0; row(r.self)->table(); + Value& result=*new(pool) VHash(pool); if(const Array *columns=table.columns()) if(columns->size()>1) { - Pool& pool=r.pool(); const String& key_field_name=params->as_no_junction(0, "key field name must not be code").as_string(); @@ -402,12 +405,11 @@ static void _hash(Request& r, const Stri } // integers: key_field & value_fields - Value& result=*new(pool) VHash(pool); Row_info row_info={&table, key_field, &value_fields, result.get_hash()}; table.for_each(table_row_to_hash, &row_info); - result.set_name(method_name); - r.write_no_lang(result); } + result.set_name(method_name); + r.write_no_lang(result); } /// used by table: _sort / sort_cmp_string|sort_cmp_double @@ -506,7 +508,7 @@ static void _flip(Request& r, const Stri new_table+=&new_row; } - vtable.set_table(new_table); + r.write_no_lang(*new(pool) VTable(pool, &new_table)); } static void _append(Request& r, const String& method_name, MethodParams *params) { @@ -520,10 +522,7 @@ static void _append(Request& r, const St string.split(row, 0, "\t", 1, String::UL_CLEAN); VTable& vtable=*static_cast(r.self); - // disable ^a.menu{^a.append[]} - vtable.lock(); vtable.table()+=&row; - vtable.unlock(); } static void _join(Request& r, const String& method_name, MethodParams *params) { @@ -617,15 +616,18 @@ static void _sql(Request& r, const Strin 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& options_param=params->as_no_junction(1, "options must be hash, not code"); + if(Hash *options=options_param.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); @@ -648,14 +650,13 @@ static void _sql(Request& r, const Strin PTHROW(rethrow_me.type(), rethrow_me.code(), &statement_string, // setting more specific source [were url] rethrow_me.comment()); - - if(!handlers.table) - PTHROW(0, 0, - &statement_string, - "no table result"); + + Table *result= + handlers.table?handlers.table: // query resulted in table? return it + new(pool) Table(pool, &method_name, 0); // query returned no table, fake it // replace any previous table value - static_cast(r.self)->set_table(*handlers.table); + static_cast(r.self)->set_table(*result); } static void _dir(Request& r, const String& method_name, MethodParams *params) { @@ -742,10 +743,10 @@ static void _columns(Request& r, const S Table& source_table=static_cast(r.self)->table(); if(const Array *source_columns=source_table.columns()) { - int size=source_columns->quick_size(); - for(int i=0; iquick_get(i); + result_row+=i.next(); result_table+=&result_row; } } @@ -814,8 +815,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:sql[query] + // ^table:sql[query][$.limit(1) $.offset(2)] + add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); // ^table:dir[path] // ^table:dir[path][regexp]