--- parser3/src/classes/table.C 2009/04/15 04:50:48 1.248 +++ parser3/src/classes/table.C 2010/10/21 15:06:29 1.276 @@ -5,11 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2009/04/15 04:50:48 $"; +static const char * const IDENT_TABLE_C="$Date: 2010/10/21 15:06:29 $"; -#ifndef NO_STRINGSTREAM +#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include -using namespace std; #endif #include "classes.h" @@ -17,6 +16,7 @@ using namespace std; #include "pa_common.h" #include "pa_request.h" +#include "pa_charsets.h" #include "pa_vtable.h" #include "pa_vint.h" #include "pa_sql_connection.h" @@ -26,23 +26,15 @@ using namespace std; class MTable: public Methoded { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); } - + Value* create_new_value(Pool&) { return new VTable(); } public: MTable(); - -public: // Methoded - bool used_directly() { return true; } }; // global variable DECLARE_CLASS_VAR(table, new MTable, 0); -// externs - -extern String cycle_data_name; - #define TABLE_REVERSE_NAME "reverse" // globals @@ -58,12 +50,12 @@ String table_reverse_name(TABLE_REVERSE_ // methods static Table::Action_options get_action_options(Request& r, MethodParams& params, - const Table& source) { + size_t options_index, const Table& source) { Table::Action_options result; - if(!params.count()) + if(params.count() <= options_index) return result; - Value& maybe_options=params.last(); + Value& maybe_options=params[options_index]; /* can not do it: want to enable ^table::create[$source; # $.option[] @@ -110,9 +102,7 @@ static Table::Action_options get_action_ } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); return result; } @@ -130,7 +120,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 ) { @@ -160,7 +150,7 @@ struct TableSeparators { static void _create(Request& r, MethodParams& params) { // clone/copy part? if(Table *source=params[0].get_table()) { - Table::Action_options o=get_action_options(r, params, *source); + Table::Action_options o=get_action_options(r, params, 1, *source); check_option_param(o.defined, params, 1, "too many parameters"); GET_SELF(r, VTable).set_table(*new Table(*source, o)); @@ -230,9 +220,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; @@ -253,7 +243,7 @@ struct lsplit_result { inline lsplit_result lsplit(char* string, char delim1, char delim2) { lsplit_result result; - if(string) { + if(string) { char delims[]={delim1, delim2, 0}; if(char* v=strpbrk(string, delims)) { result.delim=*v; @@ -261,27 +251,27 @@ inline lsplit_result lsplit(char* string result.piece=v+1; return result; } - } + } result.piece=0; result.delim=0; - return result; + return result; } inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) { - lsplit_result result; + lsplit_result result; result.piece=*string_ref; lsplit_result next=lsplit(*string_ref, delim1, delim2); result.delim=next.delim; *string_ref=next.piece; - return result; + return result; } static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) { lsplit_result result; - if(char* string=*string_ref) { + if(char* string=*string_ref) { if(encloser && *string==encloser) { - string++; + string++; char *read; char *write; @@ -307,9 +297,9 @@ static lsplit_result lsplit(char** strin return result; } else return lsplit(string_ref, delim1, delim2); - } + } result.piece=0; - return result; + return result; } static void skip_empty_and_comment_lines( char** data_ref ) { @@ -326,6 +316,22 @@ static void skip_empty_and_comment_lines } } +static void skip_empty_lines( char** data_ref ) { + if(char *data=*data_ref) { + while( char c=*data ) { + if( c== '\n' ) { + /*nowhere=*/getrow(&data); // remove empty lines + if(!(*data_ref=data)) + break; + continue; + } + break; + } + } +} + +typedef void (*Skip_lines_action)(char** data_ref); + 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; @@ -350,6 +356,8 @@ static void _load(Request& r, MethodPara options ); + Skip_lines_action skip_lines_action = (separators.column=='#' || separators.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines; + // parse columns Table::columns_type columns; if(nameless) { @@ -357,9 +365,9 @@ static void _load(Request& r, MethodPara } else { columns=Table::columns_type(new ArrayString); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) { - *columns+=new String(sr.piece, 0, true); + *columns+=new String(sr.piece, String::L_TAINTED); if(sr.delim=='\n') break; } @@ -370,15 +378,15 @@ static void _load(Request& r, MethodPara // parse cells Table::element_type row(new ArrayString(columns_count)); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); 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, String::L_TAINTED); if(sr.delim=='\n') { table+=row; row=new ArrayString(columns_count); - skip_empty_and_comment_lines(&data); + skip_lines_action(&data); } } // last line [if without \n] @@ -389,51 +397,56 @@ static void _load(Request& r, MethodPara GET_SELF(r, VTable).set_table(table); } -#ifdef NO_STRINGSTREAM +#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) -void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) { +#include "gc_allocator.h" + +typedef std::basic_stringstream, gc_allocator > pa_stringstream; +typedef std::basic_string, gc_allocator > pa_string; + +void maybe_enclose( pa_stringstream& to, const String& from, char encloser ) { if(encloser) { - to<<*sencloser; + to<count()) - throw Exception(PARSER_RUNTIME, - 0, - "invalid option passed"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { throw Exception(PARSER_RUNTIME, 0, @@ -480,102 +491,101 @@ static void _save(Request& r, MethodPara Table& table=GET_SELF(r, VTable).table(); -#ifdef NO_STRINGSTREAM +#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) - String sdata; + pa_stringstream ost(std::stringstream::out); + + // process header if(output_column_names) { if(table.columns()) { // named table for(Array_iterator i(*table.columns()); i.has_next(); ) { - maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser ); - if(i.has_next()) - sdata<<*separators.scolumn; + maybe_enclose( ost, *i.next(), separators.encloser ); + if(i.has_next()){ + ost<count():0) for(int column=0; column i(table); while(i.has_next()) { for(Array_iterator c(*i.next()); c.has_next(); ) { - maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser ); + maybe_enclose( ost, *c.next(), separators.encloser ); if(c.has_next()) - sdata<<*separators.scolumn; + ost< i(*table.columns()); i.has_next(); ) { - maybe_enclose( ost, *i.next(), separators.encloser ); - if(i.has_next()){ - ost<count():0) for(int column=0; column i(table); while(i.has_next()) { for(Array_iterator c(*i.next()); c.has_next(); ) { - maybe_enclose( ost, *c.next(), separators.encloser ); + maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser ); if(c.has_next()) - ost< - cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + InCycle temp(r); Value& body_code=params.as_junction(0, "body must be code"); Value* delim_maybe_code=params.count()>1?¶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)); - else - need_delim=true; - } + 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; + } - r.write_pass_lang(sv_processed); + r.write_pass_lang(sv_processed); - if(lskip==Request::SKIP_BREAK) - break; + if(lskip==Request::SKIP_BREAK) + break; + } + } else { + for(int row=0; rowvalue_type) { case C_STRING: { - exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0)))); + size_t index=info->value_fields->get(0); + exist=info->hash->put_dont_replace(*key, (index < row->count()) ? new VString(*row->get(index)) : new VString()); break; } case C_HASH: { @@ -776,16 +799,12 @@ static void _hash(Request& r, MethodPara } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } } if(param_index==2) // options was specified but not as hash - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); Array value_fields; if(param_index==0){ // list of columns wasn't specified @@ -903,6 +922,14 @@ static void _sort(Request& r, MethodPara else seq[i].value.d=value.as_double(); } + + // @todo: handle this elsewhere + if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) { + for(i=0; ir->process_to_value(*info->expression_code).as_bool(); } -static bool _locate_expression(Table& table, Table::Action_options o, - Request& r, MethodParams& params) { - check_option_param(o.defined, params, 1, - "locate by expression only has parameters: expression and, maybe, options"); + +static bool _locate_expression(Table& table, Request& r, MethodParams& params) { Value& expression_code=params.as_junction(0, "must be expression"); + const size_t options_index=1; + Table::Action_options o=get_action_options(r, params, options_index, table); + check_option_param(o.defined, params, options_index, "locate by expression only has parameters: expression and, maybe, options"); Expression_is_true_info info={&r, &expression_code}; return table.table_first_that(expression_is_true, &info, o); } -static bool _locate_name_value(Table& table, Table::Action_options o, - Request&, MethodParams& params) { - check_option_param(o.defined, params, 2, - "locate by locate by name has parameters: name, value and, maybe, options"); + +static bool _locate_name_value(Table& table, Request& r, MethodParams& params) { const String& name=params.as_string(0, "column name must be string"); const String& value=params.as_string(1, VALUE_MUST_BE_STRING); + const size_t options_index=2; + Table::Action_options o=get_action_options(r, params, options_index, table); + check_option_param(o.defined, params, options_index, "locate by name has parameters: name, value and, maybe, options"); + return table.locate(name, value, o); } + static void _locate(Request& r, MethodParams& params) { Table& table=GET_SELF(r, VTable).table(); - Table::Action_options o=get_action_options(r, params, table); - 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)); + _locate_expression(table, r, params) : + _locate_name_value(table, r, params); + r.write_no_lang(VBool::get(result)); } @@ -959,7 +989,7 @@ static void _flip(Request& r, MethodPara Table& old_table=GET_SELF(r, VTable).table(); Table& new_table=*new Table(0); if(size_t old_count=old_table.count()) - if(size_t old_cols=old_table[0]->count()) + if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table[0]->count()) for(size_t column=0; columnas_string().cstr(String::L_UNSPECIFIED); + ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS); ph.is_null=avalue->get_class()==void_class; ph.were_updated=false; @@ -1109,10 +1135,7 @@ void unmarshal_bind_updates(HashStringVa if(ph->is_null) value=VVoid::get(); else - if(ph->value) - value=new VString(*new String(ph->value, 0, true/*tainted*/)); - else - value=new VString(*new String()); + value=new VString(*new String(ph->value, String::L_TAINTED)); hash.put(ph->name, value); } } @@ -1141,13 +1164,9 @@ static void _sql(Request& r, MethodParam offset=(ulong)r.process_to_value(*voffset).as_double(); } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); + throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); } SQL_Driver::Placeholder* placeholders=0; @@ -1157,8 +1176,8 @@ static void _sql(Request& r, MethodParam Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); + Table_sql_event_handlers handlers; #ifdef RESOURCES_DEBUG struct timeval mt[2];