--- parser3/src/classes/table.C 2008/02/14 09:10:24 1.239 +++ parser3/src/classes/table.C 2009/05/13 09:01:00 1.255 @@ -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: 2008/02/14 09:10:24 $"; +static const char * const IDENT_TABLE_C="$Date: 2009/05/13 09:01:00 $"; +#ifndef NO_STRINGSTREAM #include using namespace std; +#endif #include "classes.h" #include "pa_vmethod_frame.h" @@ -128,7 +130,7 @@ struct TableSeparators { char encloser; const String* sencloser; TableSeparators(): - column('\t'), scolumn(new String("\t", false)), + column('\t'), scolumn(new String("\t")), encloser(0), sencloser(0) {} int load( HashStringValue& options ) { @@ -228,9 +230,9 @@ static void _create(Request& r, MethodPa Array_iterator i(rows); while(i.has_next()) { Table::element_type row(new ArrayString); - const String& string=*i.next(); + const String& string=*i.next(); // remove comment lines - if(!string.length()) + if(string.is_empty()) continue; size_t col_pos_after=0; @@ -342,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 @@ -357,7 +359,7 @@ static void _load(Request& r, MethodPara skip_empty_and_comment_lines(&data); while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) { - *columns+=new String(sr.piece, 0, true); + *columns+=new String(sr.piece, true/*tainted*/); if(sr.delim=='\n') break; } @@ -372,7 +374,7 @@ static void _load(Request& r, MethodPara while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) { if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n] break; - *row+=new String(sr.piece, 0, true); + *row+=new String(sr.piece, true/*tainted*/); if(sr.delim=='\n') { table+=row; row=new ArrayString(columns_count); @@ -387,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; @@ -407,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_index1?¶ms[1]:0; Table& table=GET_SELF(r, VTable).table(); - bool need_delim=false; int saved_current=table.current(); int size=table.count(); - for(int row=0; rowlength()) { // 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; - } - r.write_pass_lang(sv_processed); + if(delim_maybe_code) { // delimiter set + bool need_delim=false; + for(int row=0; rowis_empty()) { // we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + else + need_delim=true; + } - if(lskip==Request::SKIP_BREAK) - break; + r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; + } + } else { + for(int row=0; rowvalue_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(); ) { @@ -713,18 +701,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 @@ -733,8 +719,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, @@ -978,7 +964,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)); } @@ -1061,9 +1047,9 @@ public: columns(*new ArrayString), row(0), table(0) { } - bool add_column(SQL_Error& error, const char *str, size_t length) { + bool add_column(SQL_Error& error, const char *str, size_t) { try { - columns+=new String(str, length, true); + columns+=new String(str, true/*tainted*/); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); @@ -1134,10 +1120,10 @@ 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*/)); + value=new VString(*new String(ph->value, true/*tainted*/)); else value=new VString(*new String()); hash.put(ph->name, value); @@ -1148,7 +1134,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");