--- parser3/src/classes/table.C 2007/08/28 09:28:18 1.233 +++ parser3/src/classes/table.C 2009/04/16 01:10:21 1.249 @@ -1,14 +1,16 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2007/08/28 09:28:18 $"; +static const char * const IDENT_TABLE_C="$Date: 2009/04/16 01:10:21 $"; +#ifndef NO_STRINGSTREAM #include using namespace std; +#endif #include "classes.h" #include "pa_vmethod_frame.h" @@ -123,6 +125,38 @@ static void check_option_param(bool opti "%s", msg); } +struct TableSeparators { + char column; const String* scolumn; + char encloser; const String* sencloser; + + TableSeparators(): + column('\t'), scolumn(new String("\t", false)), + encloser(0), sencloser(0) + {} + int load( HashStringValue& options ) { + int result=0; + if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) { + scolumn=&vseparator->as_string(); + if(scolumn->length()!=1) + throw Exception(PARSER_RUNTIME, + scolumn, + "separator must be one character long"); + column=scolumn->first_char(); + result++; + } + if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) { + sencloser=&vencloser->as_string(); + if(sencloser->length()!=1) + throw Exception(PARSER_RUNTIME, + sencloser, + "encloser must be one character long"); + encloser=sencloser->first_char(); + result++; + } + return result; + } +}; + static void _create(Request& r, MethodParams& params) { // clone/copy part? if(Table *source=params[0].get_table()) { @@ -133,20 +167,49 @@ static void _create(Request& r, MethodPa return; } - // data is last parameter + size_t data_param_index=0; + bool nameless=false; + + if(params.count()>1) { + if(params[0].is_string()){ // can be nameless only + const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction"); + if(snameless!="nameless") + throw Exception(PARSER_RUNTIME, + &snameless, + "table::create called with more then 1 param, first param may be only 'nameless'"); + nameless=true; + data_param_index++; + } + } + + HashStringValue *options=0; + TableSeparators separators; + + size_t options_param_index=data_param_index+1; + if( + options_param_indexsplit(*columns, col_pos_after, "\t", String::L_AS_IS); + head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS); } } @@ -173,7 +236,7 @@ static void _create(Request& r, MethodPa continue; size_t col_pos_after=0; - string.split(*row, col_pos_after, "\t", String::L_AS_IS); + string.split(*row, col_pos_after, *separators.scolumn, String::L_AS_IS); table+=row; } @@ -263,38 +326,6 @@ static void skip_empty_and_comment_lines } } -struct TableSeparators { - char column; const String* scolumn; - char encloser; const String* sencloser; - - TableSeparators(): - column('\t'), scolumn(new String("\t", false)), - encloser(0), sencloser(0) - {} - int load( HashStringValue& options ) { - int result=0; - if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) { - scolumn=&vseparator->as_string(); - if(scolumn->length()!=1) - throw Exception(PARSER_RUNTIME, - scolumn, - "separator must be one character long"); - column=scolumn->first_char(); - result++; - } - if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) { - sencloser=&vencloser->as_string(); - if(sencloser->length()!=1) - throw Exception(PARSER_RUNTIME, - sencloser, - "encloser must be one character long"); - encloser=sencloser->first_char(); - result++; - } - return result; - } -}; - static void _load(Request& r, MethodParams& params) { const String& first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING); int filename_param_index=0; @@ -313,7 +344,7 @@ static void _load(Request& r, MethodPara } // loading text - char *data=file_read_text(r.charsets, + char *data=file_load_text(r, r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options @@ -358,6 +389,8 @@ static void _load(Request& r, MethodPara GET_SELF(r, VTable).set_table(table); } +#ifdef NO_STRINGSTREAM + void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) { if(encloser) { to<<*sencloser; @@ -378,6 +411,8 @@ void maybe_enclose( String& to, const St to<count()) - throw Exception(PARSER_RUNTIME, - 0, - "invalid option passed"); - } else { - throw Exception(PARSER_RUNTIME, - 0, - "additional params must be hash (did you spell mode parameter correctly?)"); - } - } - } - if(param_indexlength()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? r.write_pass_lang(r.process(*delim_maybe_code)); - need_delim=true; + else + need_delim=true; } + r.write_pass_lang(sv_processed); if(lskip==Request::SKIP_BREAK) @@ -663,15 +670,13 @@ static void table_row_to_hash(Table::ele if(!key) return; // ignore rows without key [too-short-record_array if-indexed] - bool exist = false; - switch (info->value_type) { - case C_STRING: - { + bool exist=false; + switch(info->value_type) { + case C_STRING: { exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0)))); + break; } - break; - case C_HASH: - { + case C_HASH: { VHash* vhash=new VHash; HashStringValue& hash=vhash->hash(); for(Array_iterator i(*info->value_fields); i.has_next(); ) { @@ -683,18 +688,16 @@ static void table_row_to_hash(Table::ele } exist=info->hash->put_dont_replace(*key, vhash); + break; } - break; - case C_TABLE: - { - VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed? - if( info->distinct==D_ILLEGAL ){ - exist=true; - break; - } - + case C_TABLE: { + VTable* vtable=(VTable*)info->hash->get(*key); // table exist? Table* table; if(vtable) { + if(info->distinct==D_ILLEGAL) { + exist=true; + break; + } table=vtable->get_table(); } else { // no? creating table of same structure as source @@ -703,8 +706,8 @@ static void table_row_to_hash(Table::ele info->hash->put(*key, new VTable(table)); } *table+=row; + break; } - break; } if(exist && info->distinct==D_ILLEGAL) throw Exception(PARSER_RUNTIME, @@ -736,18 +739,16 @@ Table2hash_value_type get_value_type(Val static void _hash(Request& r, MethodParams& params) { Table& self_table=GET_SELF(r, VTable).table(); VHash& result=*new VHash; - if(Table::columns_type columns=self_table.columns()) + if(Table::columns_type columns=self_table.columns()){ if(columns->count()>0) { Table2hash_distint distinct=D_ILLEGAL; Table2hash_value_type value_type=C_HASH; int param_index=params.count()-1; if(param_index>0) { - if(HashStringValue* options= - params.as_no_junction(param_index, "param must not be code").get_hash() - ){ + if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified --param_index; int valid_options=0; - if(Value* vdistinct_code=options->get(sql_distinct_name)) { + if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ? valid_options++; Value& vdistinct_value=r.process_to_value(*vdistinct_code); if(vdistinct_value.is_string()) { @@ -755,23 +756,24 @@ static void _hash(Request& r, MethodPara if(sdistinct=="tables") { value_type=C_TABLE; distinct=D_FIRST; - } else + } else { throw Exception(PARSER_RUNTIME, &sdistinct, "must be 'tables' or true/false"); - } else + } + } else { distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL; + } } - if(Value* vvalue_type_code=options->get(sql_value_type_name)) { - if(value_type==C_TABLE){ // $.distinct[tables] was specified already + if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ? + if(value_type==C_TABLE) // $.distinct[tables] already was specified throw Exception(PARSER_RUNTIME, 0, - "you can't specify $.distinct[tables] and $.type[] together."); - } else { - valid_options++; - value_type=get_value_type(r.process_to_value(*vvalue_type_code)); - } - } + "you can't specify $.distinct[tables] and $.type[] together"); + + valid_options++; + value_type=get_value_type(r.process_to_value(*vvalue_type_code)); + } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, @@ -779,48 +781,46 @@ static void _hash(Request& r, MethodPara "called with invalid option"); } } - if(param_index==2) // bad options param type + + if(param_index==2) // options was specified but not as hash throw Exception(PARSER_RUNTIME, 0, "options must be hash"); Array value_fields; - if(param_index>0) { + if(param_index==0){ // list of columns wasn't specified + if(value_type==C_STRING) // $.type[string] + throw Exception(PARSER_RUNTIME, + 0, + "you must specify one value field with option $.type[string]"); + + for(size_t i=0; icount(); i++) // by all columns, including key + value_fields+=i; + + } else { // list of columns was specified if(value_type==C_TABLE) throw Exception(PARSER_RUNTIME, 0, - "in distinct[tables] mode you may not specify value field(s)"); + "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]"); + Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code"); - if(value_fields_param.is_string()) { - value_fields+=self_table.column_name2index( - *value_fields_param.get_string(), true); - } else if(Table* value_fields_table=value_fields_param.get_table()) { - for(Array_iterator i(*value_fields_table); - i.has_next(); ) { - const String& value_field_name - =*i.next()->get(0); - value_fields - +=self_table.column_name2index(value_field_name, true); + if(value_fields_param.is_string()) { // one column as string was specified + value_fields+=self_table.column_name2index(*value_fields_param.get_string(), true); + } else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table + for(Array_iterator i(*value_fields_table); i.has_next(); ) { + const String& value_field_name =*i.next()->get(0); + value_fields +=self_table.column_name2index(value_field_name, true); } } else throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table"); - - } else { // by all columns, including key - if(value_type==C_STRING) - throw Exception(PARSER_RUNTIME, - 0, - "with $.type[string] you must specify one value field(s)"); - // if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST)) - for(size_t i=0; icount(); i++) - value_fields+=i; } if(value_type==C_STRING && value_fields.count()!=1) throw Exception(PARSER_RUNTIME, 0, - "you can specify one value field with this $.type[]."); + "you can specify only one value field with option $.type[string]"); { Value* key_param=¶ms[0]; @@ -845,6 +845,7 @@ static void _hash(Request& r, MethodPara result.extract_default(); } } + } r.write_no_lang(result); } @@ -950,7 +951,7 @@ static void _locate(Request& r, MethodPa bool result=params[0].get_junction()? _locate_expression(table, o, r, params) : _locate_name_value(table, o, r, params); - r.write_no_lang(*new VBool(result)); + r.write_no_lang(VBool::get(result)); } @@ -1106,7 +1107,7 @@ void unmarshal_bind_updates(HashStringVa if(ph->were_updated) { Value* value; if(ph->is_null) - value=new VVoid(); + value=VVoid::get(); else if(ph->value) value=new VString(*new String(ph->value, 0, true/*tainted*/)); @@ -1120,7 +1121,7 @@ static void _sql(Request& r, MethodParam Value& statement=params.as_junction(0, "statement must be code"); HashStringValue* bind=0; - ulong limit=0; + ulong limit=SQL_NO_LIMIT; ulong offset=0; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); @@ -1244,9 +1245,9 @@ MTable::MTable(): Methoded("table") { // ^table::create{data} // ^table::create[nameless]{data} // ^table::create[table] - add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2); + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3); // old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf - add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2); + add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3); // ^table::load[file] // ^table::load[nameless;file] @@ -1273,8 +1274,8 @@ MTable::MTable(): Methoded("table") { // ^table.menu{code}[delim] add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2); - // ^table:hash[key field name] - // ^table:hash[key field name][value field name(s) string/table] + // ^table.hash[key field name] + // ^table.hash[key field name][value field name(s) string/table] add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3); // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc] @@ -1294,11 +1295,11 @@ MTable::MTable(): Methoded("table") { add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2); - // ^table:sql[query] - // ^table:sql[query][$.limit(1) $.offset(2)] + // ^table::sql[query] + // ^table::sql[query][$.limit(1) $.offset(2)] add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2); - // ^table:columns[[column name]] + // ^table.columns[[column name]] add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1); // ^table.select(expression) = table