--- parser3/src/classes/string.C 2001/07/18 10:06:04 1.63 +++ parser3/src/classes/string.C 2001/07/27 12:59:36 1.68 @@ -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.68 2001/07/27 12:59:36 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -183,9 +183,10 @@ static void replace_action(Table& table, vtable.set_name(*ai.origin); Junction *junction=ai.replacement_code->get_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,6 +264,46 @@ static void _lower(Request& r, const Str change_case(r, method_name, params, String::CC_LOWER); } +#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) { Pool& pool=r.pool(); @@ -271,20 +314,16 @@ 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); - 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, 0, 0, + handlers); } PCATCH(e) { // query problem rethrow_me=e; need_rethrow=true; @@ -295,26 +334,10 @@ 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) { @@ -322,11 +345,16 @@ static void _sql(Request& r, const Strin const String *string=sql_result_string(r, method_name, params); 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(params->size()>1) { + 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; + } else + PTHROW(0, 0, + &method_name, + "produced no result, but no default specified"); } VString& result=*new(pool) VString(*string); result.set_name(method_name); @@ -375,9 +403,9 @@ MString::MString(Pool& apool) : Methoded // ^string.tolower[] add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); + // ^string:sql[query] // ^string:sql[query]{default} - // ^string:sql[query]{default}(offset) - add_native_method("sql", Method::CT_STATIC, _sql, 2, 3); + add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } // global variable