--- parser3/src/classes/string.C 2001/07/18 10:06:04 1.63 +++ parser3/src/classes/string.C 2001/08/07 13:54:13 1.70 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: string.C,v 1.63 2001/07/18 10:06:04 parser Exp $"; +static const char *RCSId="$Id: string.C,v 1.70 2001/08/07 13:54:13 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -124,10 +124,10 @@ static void _lsplit(Request& r, const St Table& table=*new(pool) Table(pool, &string, &columns, pieces.size()); - int size=pieces.quick_size(); - for(int i=0; iget_junction(); - junction->rcontext=/*must be some way to get to - outside world junction->root=*/&vtable; + Value *saved_match_var_value=junction->root->get_element(*match_var_name); + junction->root->put_element(*match_var_name, &vtable); Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false); + junction->root->put_element(*match_var_name, saved_match_var_value); /* ai.dest->APPEND_CONST("("); @@ -214,17 +215,19 @@ static void _match(Request& r, const Str Temp_lang temp_lang(r, String::UL_PASS_APPENDED); Table *table; if(params->size()<3) { // search + bool was_global; bool matched=src.match(r.pcre_tables, &method_name, regexp.as_string(), options, &table, - search_action, 0); + search_action, 0, + &was_global); // matched - if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings - table->size()<=1) // just one row, not /g_lobal search - result=new(pool) VBool(pool, matched); - else // table of pre/match/post+substrings - result=new(pool) VTable(pool, table); + // not (just matched[3=pre/match/post], no substrings) or Global search + if(table->columns()->size()>3 || was_global) + result=new(pool) VTable(pool, table); // table of pre/match/post+substrings + else + result=new(pool) VBool(pool, matched); } else { // replace Value& replacement_code=params->as_junction(2, "replacement code must be code"); @@ -261,7 +264,48 @@ static void _lower(Request& r, const Str change_case(r, method_name, params, String::CC_LOWER); } -const String* sql_result_string(Request& r, const String& method_name, MethodParams *params) { +#ifndef DOXYGEN +class String_sql_event_handlers : public SQL_Driver_query_event_handlers { +public: + String_sql_event_handlers(Pool& apool, + const String& astatement_string, const char *astatement_cstr) : + pool(apool), + statement_string(astatement_string), + statement_cstr(astatement_cstr), + got_column(false), got_cell(false) { + result=new(pool) String(pool); + } + + void add_column(void *ptr, size_t size) { + if(got_column) + PTHROW(0, 0, + &statement_string, + "result must contain exactly one column"); + got_column=true; + } + void before_rows() { /* ignore */ } + void add_row() { /* ignore */ } + void add_row_cell(void *ptr, size_t size) { + if(got_cell) + PTHROW(0, 0, + &statement_string, + "result must not contain more then one row"); + got_cell=true; + + result->APPEND_TAINTED((const char *)ptr, size, statement_cstr, 0); + } + +private: + Pool& pool; + const String& statement_string; const char *statement_cstr; + bool got_column; +public: + bool got_cell; + String *result; +}; +#endif +const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, + Hash *&options) { Pool& pool=r.pool(); if(!r.connection) @@ -271,20 +315,32 @@ const String* sql_result_string(Request& Value& statement=params->as_junction(0, "statement must be code"); - ulong offset=(ulong)(params->size()>2?params->as_int(2, r):0); + ulong limit=0; + ulong offset=0; + if(params->size()>1) { + Value& options_param=params->as_no_junction(1, "options must be hash, not code"); + if(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"); + } else + options=0; Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process(statement).as_string(); const char *statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection); - unsigned int sql_column_count; SQL_Driver::Cell *sql_columns; - unsigned long sql_row_count; SQL_Driver::Cell **sql_rows; + String_sql_event_handlers handlers(pool, statement_string, statement_cstr); bool need_rethrow=false; Exception rethrow_me; PTRY { r.connection->query( - statement_cstr, offset, 0, - &sql_column_count, &sql_columns, - &sql_row_count, &sql_rows); + statement_cstr, offset, limit, + handlers); } PCATCH(e) { // query problem rethrow_me=e; need_rethrow=true; @@ -295,38 +351,35 @@ const String* sql_result_string(Request& &statement_string, // setting more specific source [were url] rethrow_me.comment()); - if(sql_column_count!=1) - PTHROW(0, 0, - &statement_string, - "result must contain exactly one column"); - - if(!sql_row_count) - return 0; // no lines, should return second param[default value] + if(!handlers.got_cell) + return 0; // no lines, caller should return second param[default value] - if(sql_row_count>1) - PTHROW(0, 0, - &statement_string, - "result must not contain more then one row"); - - String *result=new(pool) String(pool); - SQL_Driver::Cell& cell=sql_rows[0][0]; - result->APPEND_TAINTED( - (const char *)cell.ptr, cell.size, - statement_cstr, 0); - - return result; + return handlers.result; } static void _sql(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String *string=sql_result_string(r, method_name, params); + Hash *options; + const String *string=sql_result_string(r, method_name, params, options); if(!string) { - Value& default_code=params->as_junction(1, "default result must code"); - Value& processed_code=r.process(default_code); - string=processed_code.get_string(); - if(!string) - string=empty_string; + if(options) { + if(Value *vdefault=(Value *)options->get(*sql_default_name)) { + if(!vdefault->get_junction()) + PTHROW(0, 0, + &method_name, + "default option must be code"); + string=r.process(*vdefault).get_string(); + if(!string) + string=empty_string; + } else + PTHROW(0, 0, + &method_name, + "produced no result, but no default option specified"); + } else + PTHROW(0, 0, + &method_name, + "produced no result, but no options (no default) specified"); } VString& result=*new(pool) VString(*string); result.set_name(method_name); @@ -375,9 +428,9 @@ MString::MString(Pool& apool) : Methoded // ^string.tolower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); - // ^string:sql[query]{default} - // ^string:sql[query]{default}(offset) - add_native_method("sql", Method::CT_STATIC, _sql, 2, 3); + // ^sql[query] + // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] + add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } // global variable