--- parser3/src/classes/table.C 2005/08/26 11:12:45 1.211 +++ parser3/src/classes/table.C 2006/04/09 13:38:47 1.221 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2005/08/26 11:12:45 $"; +static const char * const IDENT_TABLE_C="$Date: 2006/04/09 13:38:47 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -34,11 +34,13 @@ public: // Methoded DECLARE_CLASS_VAR(table, new MTable, 0); +// externs + +extern String cycle_data_name; + // defines for globals #define SQL_BIND_NAME "bind" -#define SQL_LIMIT_NAME "limit" -#define SQL_OFFSET_NAME "offset" #define SQL_DEFAULT_NAME "default" #define SQL_DISTINCT_NAME "distinct" #define TABLE_REVERSE_NAME "reverse" @@ -46,18 +48,12 @@ DECLARE_CLASS_VAR(table, new MTable, 0); // globals String sql_bind_name(SQL_BIND_NAME); -String sql_limit_name(SQL_LIMIT_NAME); -String sql_offset_name(SQL_OFFSET_NAME); +String sql_limit_name(PA_SQL_LIMIT_NAME); +String sql_offset_name(PA_SQL_OFFSET_NAME); String sql_default_name(SQL_DEFAULT_NAME); String sql_distinct_name(SQL_DISTINCT_NAME); String table_reverse_name(TABLE_REVERSE_NAME); -// local defines - -#define COLUMN_SEPARATOR_NAME "separator" -#define COLUMN_ENCLOSER_NAME "encloser" - - // methods static Table::Action_options get_action_options(Request& r, MethodParams& params, @@ -73,6 +69,7 @@ static Table::Action_options get_action_ ] but there is ^table.locate[name;value] + ...if(voptions.is_defined() && !voptions.is_string())) if(maybe_options.is_string()) { // allow empty options result.defined=true; return result; @@ -146,6 +143,11 @@ static void _create(Request& r, MethodPa size_t raw_pos_after=0; Table::columns_type columns; if(params.count()==2) { + const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'"); + if(snameless!="nameless") + throw Exception("parser.runtime", + &snameless, + "table::create called with two params, first param may only be 'nameless'"); columns=Table::columns_type(0); // nameless } else { columns=Table::columns_type(new ArrayString); @@ -270,25 +272,27 @@ struct TableSeparators { column('\t'), scolumn(new String("\t", false)), encloser(0), sencloser(0) {} - void load( HashStringValue& options ) { - if(Value* vseparator=options.get(COLUMN_SEPARATOR_NAME)) { - options.remove(COLUMN_SEPARATOR_NAME); + 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(COLUMN_ENCLOSER_NAME)) { - options.remove(COLUMN_ENCLOSER_NAME); + 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; } }; @@ -332,9 +336,10 @@ static void _load(Request& r, MethodPara } Table& table=*new Table(columns); + int columns_count=columns? columns->count(): 0; // parse cells - Table::element_type row(new ArrayString); + Table::element_type row(new ArrayString(columns_count)); skip_empty_and_comment_lines(&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] @@ -342,7 +347,7 @@ static void _load(Request& r, MethodPara *row+=new String(sr.piece, 0, true); if(sr.delim=='\n') { table+=row; - row=new ArrayString; + row=new ArrayString(columns_count); skip_empty_and_comment_lines(&data); } } @@ -359,8 +364,9 @@ static void maybe_enclose( String& to, c to<<*sencloser; // while we have 'encloser'... size_t pos_after=0; - for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before+1) { - to<count()) + int valid_options=separators.load(*options); + if(valid_options!=options->count()) throw Exception("parser.runtime", 0, "invalid option passed"); @@ -447,8 +453,13 @@ static void _save(Request& r, MethodPara } // write - file_write(r.absolute(file_name), - sdata.cstr(), sdata.length(), true, do_append); + { + const char* data_cstr=sdata.cstr(); + file_write(r.absolute(file_name), + data_cstr, sdata.length(), true, do_append); + if(*data_cstr) // not empty (when empty it's not heap memory) + pa_free((void*)data_cstr); // not needed anymore + } } static void _count(Request& r, MethodParams&) { @@ -484,6 +495,9 @@ static void _offset(Request& r, MethodPa } static void _menu(Request& r, MethodParams& params) { + Temp_hash_value + cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + Value& body_code=params.as_junction(0, "body must be code"); Value* delim_maybe_code=params.count()>1?¶ms[1]:0; @@ -496,6 +510,7 @@ static void _menu(Request& r, MethodPara table.set_current(row); StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); const String* s_processed=sv_processed.get_string(); if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? @@ -503,6 +518,9 @@ static void _menu(Request& r, MethodPara need_delim=true; } r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; } table.set_current(saved_current); } @@ -841,6 +859,7 @@ static void _join(Request& r, MethodPara #ifndef DOXYGEN class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { ArrayString& columns; + int columns_count; ArrayString* row; public: Table* table; @@ -861,6 +880,7 @@ public: bool before_rows(SQL_Error& error) { try { table=new Table(&columns); + columns_count=columns.count(); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); @@ -869,7 +889,7 @@ public: } bool add_row(SQL_Error& error) { try { - *table+=row=new ArrayString; + *table+=row=new ArrayString(columns_count); return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); @@ -910,7 +930,7 @@ int marshal_binds(HashStringValue& hash, int hash_count=hash.count(); placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count]; SQL_Driver::Placeholder* ptr=placeholders; - hash.for_each(marshal_bind, &ptr); + hash.for_each(marshal_bind, &ptr); return hash_count; } @@ -939,7 +959,7 @@ static void _sql(Request& r, MethodParam ulong offset=0; if(params.count()>1) { Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(!voptions.is_string()) + if(voptions.is_defined() && !voptions.is_string()) if(HashStringValue* options=voptions.get_hash()) { int valid_options=0; if(Value* vbind=options->get(sql_bind_name)) {