--- parser3/src/classes/string.C 2004/03/01 12:53:17 1.138 +++ parser3/src/classes/string.C 2005/11/22 11:21:35 1.147 @@ -1,11 +1,11 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2004/03/01 12:53:17 $"; +static const char * const IDENT_STRING_C="$Date: 2005/11/22 11:21:35 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -54,8 +54,6 @@ static void _length(Request& r, MethodPa static void _int(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); int converted; - Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be int") - :0; // (default) try { if(self_string.is_empty()) throw Exception("parser.runtime", @@ -63,8 +61,8 @@ static void _int(Request& r, MethodParam "parameter is empty string, error converting"); converted=self_string.as_int(); } catch(...) { // convert problem - if(default_code) - converted=r.process_to_value(*default_code).as_int(); + if(params.count()>0) + converted=params.as_int(0, "default must be int", r); // (default) else rethrow; // we have a problem when no default } @@ -74,8 +72,6 @@ static void _int(Request& r, MethodParam static void _double(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); double converted; - Value* default_code=params.count()>0?¶ms.as_junction(0, "default must be double") - :0; // (default) try { if(self_string.is_empty()) throw Exception("parser.runtime", @@ -83,8 +79,8 @@ static void _double(Request& r, MethodPa "parameter is empty string, error converting"); converted=self_string.as_double(); } catch(...) { // convert problem - if(default_code) - converted=r.process_to_value(*default_code).as_double(); + if(params.count()>0) + converted=params.as_double(0, "default must be double", r); // (default) else rethrow; // we have a problem when no default } @@ -415,31 +411,50 @@ public: } }; #endif +extern String sql_bind_name; extern String sql_limit_name; extern String sql_offset_name; extern String sql_default_name; extern String sql_distinct_name; +extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); +extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); + const String* sql_result_string(Request& r, MethodParams& params, HashStringValue*& options, Value*& default_code) { Value& statement=params.as_junction(0, "statement must be code"); + HashStringValue* bind=0; ulong limit=0; ulong offset=0; default_code=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((options=voptions.get_hash())) { - if(Value* vlimit=options->get(sql_limit_name)) + int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } + if(Value* vlimit=options->get(sql_limit_name)) { + valid_options++; limit=(ulong)r.process_to_value(*vlimit).as_double(); - if(Value* voffset=options->get(sql_offset_name)) + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; offset=(ulong)r.process_to_value(*voffset).as_double(); + } if((default_code=options->get(sql_default_name))) { + valid_options++; if(!default_code->get_junction()) throw Exception("parser.runtime", 0, "default option must be code"); } + if(valid_options!=options->count()) + throw Exception("parser.runtime", + 0, + "called with invalid option"); } else throw Exception("parser.runtime", 0, @@ -447,16 +462,26 @@ const String* sql_result_string(Request& } else options=0; + SQL_Driver::Placeholder* placeholders=0; + uint placeholders_count=0; + if(bind) + placeholders_count=marshal_binds(*bind, placeholders); + 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()); String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection()->query( - statement_cstr, offset, limit, + statement_cstr, + placeholders_count, placeholders, + offset, limit, handlers, statement_string); + if(bind) + unmarshal_bind_updates(*bind, placeholders_count, placeholders); + if(!handlers.got_cell) return 0; // no lines, caller should return second param[default value] @@ -552,6 +577,34 @@ static void _trim(Request& r, MethodPara r.write_assign_lang(src.trim(kind, chars)); } +static void _append(Request& r, MethodParams& params) { + // c=a+b + VString& va=GET_SELF(r, VString); + const String& a=va.string(); + const String& b=params.as_string(0, "parameter must be string"); + String& c=*new String(a); + c.append(b, String::L_PASS_APPENDED); + va.set_string(c); +} + +static void _base64(Request& r, MethodParams& params) { + if(params.count()) { + // decode + const char* cstr=params.as_string(0, "parameter must be string").cstr(); + void* decoded_cstr=0; + size_t decoded_size=0; + pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size); + if(decoded_cstr && decoded_size) + r.write_assign_lang(*new String(static_cast(decoded_cstr), decoded_size, true)); + } else { + // encode + VString& vself=GET_SELF(r, VString); + const char* cstr=vself.string().cstr(); + const char* encoded=pa_base64_encode(cstr, strlen(cstr)); + r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed*/)); + } +} + // constructor MString::MString(): Methoded("string") { @@ -597,7 +650,7 @@ MString::MString(): Methoded("string") { add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0); // ^sql[query] - // ^sql[query][$.limit(1) $.offset(2) $.default[n/a]] + // ^sql[query][options hash] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^string.replace[table] @@ -611,4 +664,11 @@ MString::MString(): Methoded("string") { // ^string.trim[[start|both|end][;chars]] add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); + + // ^string.append[string] + add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); + + // ^string.base64[] << encode + // ^string:base64[encoded string] << decode + add_native_method("base64", Method::CT_ANY, _base64, 0, 1); }