|
|
| version 1.125.2.8, 2003/02/14 16:52:20 | version 1.125.2.15.2.7, 2003/03/21 13:42:27 |
|---|---|
| Line 22 static const char* IDENT_STRING_C="$Date | Line 22 static const char* IDENT_STRING_C="$Date |
| // class | // class |
| class MString : public Methoded { | class MString: public Methoded { |
| public: | public: |
| MString(); | MString(); |
| public: // Methoded | public: // Methoded |
| Line 31 public: // Methoded | Line 31 public: // Methoded |
| // global variable | // global variable |
| MethodedPtr string_class(new MString); | DECLARE_CLASS_VAR(string, new MString, 0); |
| // defines for statics | // defines for statics |
| Line 39 MethodedPtr string_class(new MString); | Line 39 MethodedPtr string_class(new MString); |
| // statics | // statics |
| static StringPtr match_var_name(new String(MATCH_VAR_NAME)); | static const String& match_var_name(new String(MATCH_VAR_NAME)); |
| // methods | // methods |
| static void _length(Request& r, StringPtr method_name, MethodParams& ) { | static void _length(Request& r, const String& method_name, MethodParams* ) { |
| Pool& pool=r.pool(); | double result=GET_SELF(r, VString).string()->length(); |
| double result=GET_SELF(r, VString).string()->size(); | r.write_no_lang(Value*(new VDouble(result))); |
| r.write_no_lang(ValuePtr(new VDouble(result))); | |
| } | } |
| static void _int(Request& r, StringPtr method_name, MethodParams& params) { | static void _int(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | const String& self_string=r.get_self()->get_string(); |
| StringPtr self_string=r.get_self()->get_string(&pool); | |
| int converted; | int converted; |
| ValuePtr default_code=params.count()>0?params.as_junction(0, "default must be int") | Value* default_code=params->count()>0?params->as_junction(0, "default must be int") |
| :ValuePtr(0); // (default) | :0; // (default) |
| try { | try { |
| if(!self_string || self_string->is_empty()) | if(!self_string || self_string->is_empty()) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Line 67 static void _int(Request& r, StringPtr m | Line 65 static void _int(Request& r, StringPtr m |
| else | else |
| converted=r.process_to_value(default_code)->as_int(); | converted=r.process_to_value(default_code)->as_int(); |
| } | } |
| r.write_no_lang(ValuePtr(new VInt(converted))); | r.write_no_lang(Value*(new VInt(converted))); |
| } | } |
| static void _double(Request& r, StringPtr method_name, MethodParams& params) { | static void _double(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | const String& self_string=GET_SELF(r, VString).string(); |
| StringPtr self_string=GET_SELF(r, VString).string(); | |
| double converted; | double converted; |
| ValuePtr default_code=params.count()>0?params.as_junction(0, "default must be double") | Value* default_code=params->count()>0?params->as_junction(0, "default must be double") |
| :ValuePtr(0); // (default) | :0; // (default) |
| try { | try { |
| if(!self_string || self_string->is_empty()) | if(!self_string || self_string->is_empty()) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Line 89 static void _double(Request& r, StringPt | Line 86 static void _double(Request& r, StringPt |
| converted=r.process_to_value(default_code)->as_double(); | converted=r.process_to_value(default_code)->as_double(); |
| } | } |
| r.write_no_lang(ValuePtr(new VDouble(converted))); | r.write_no_lang(Value*(new VDouble(converted))); |
| } | } |
| /*not static*/void _string_format(Request& r, StringPtr method_name, MethodParams& params) { | /*not static*/void _string_format(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | |
| ValuePtr fmt_maybe_code=params[0]; | Value* fmt_maybe_code=(*params)[0]; |
| // for some time due to stupid {} in original design | // for some time due to stupid {} in original design |
| StringPtr fmt=r.process_to_string(fmt_maybe_code); | const String& fmt=r.process_to_string(fmt_maybe_code); |
| const char *buf=format(pool, r.get_self()->as_double(), fmt->cstr()); | const char* buf=format(r.get_self()->as_double(), fmt->cstr()); |
| String result; | String result; |
| result.APPEND_CLEAN(buf, 0, | result.APPEND_CLEAN(buf, 0, |
| Line 108 static void _double(Request& r, StringPt | Line 104 static void _double(Request& r, StringPt |
| r.write_no_lang(result); | r.write_no_lang(result); |
| } | } |
| static void _left(Request& r, StringPtr /*method_name*/, MethodParams& params) { | static void _left(Request& r, const String& /*method_name*/, MethodParams* params) { |
| size_t n=(size_t)params.as_int(0, "n must be int", r); | size_t n=(size_t)params->as_int(0, "n must be int", r); |
| StringPtr string=GET_SELF(r, VString).string(); | const String& string=GET_SELF(r, VString).string(); |
| r.write_assign_lang(*string->mid(0, n)); | r.write_assign_lang(*string->mid(0, n)); |
| } | } |
| static void _right(Request& r, StringPtr /*method_name*/, MethodParams& params) { | static void _right(Request& r, const String& /*method_name*/, MethodParams* params) { |
| size_t n=(size_t)params.as_int(0, "n must be int", r); | size_t n=(size_t)params->as_int(0, "n must be int", r); |
| StringPtr string=GET_SELF(r, VString).string(); | const String& string=GET_SELF(r, VString).string(); |
| r.write_assign_lang(*string->mid(string->size()-n, string->size())); | r.write_assign_lang(*string->mid(string->length()-n, string->length())); |
| } | } |
| static void _mid(Request& r, StringPtr /*method_name*/, MethodParams& params) { | static void _mid(Request& r, const String& /*method_name*/, MethodParams* params) { |
| StringPtr string=GET_SELF(r, VString).string(); | const String& string=GET_SELF(r, VString).string(); |
| size_t p=(size_t)max(0, params.as_int(0, "p must be int", r)); | size_t p=(size_t)max(0, params->as_int(0, "p must be int", r)); |
| size_t n=params.count()>1? | size_t n=params->count()>1? |
| (size_t)max(0, params.as_int(1, "n must be int", r)):string->size(); | (size_t)max(0, params->as_int(1, "n must be int", r)):string->length(); |
| r.write_assign_lang(*string->mid(p, p+n)); | r.write_assign_lang(*string->mid(p, p+n)); |
| } | } |
| static void _pos(Request& r, StringPtr method_name, MethodParams& params) { | static void _pos(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | Value* substr=params->as_no_junction(0, "substr must not be code"); |
| ValuePtr substr=params.as_no_junction(0, "substr must not be code"); | |
| StringPtr string=GET_SELF(r, VString).string(); | const String& string=GET_SELF(r, VString).string(); |
| r.write_assign_lang(ValuePtr(new VInt(string->pos(*substr->as_string(&pool))))); | r.write_assign_lang(Value*(new VInt(string->pos(*substr->as_string())))); |
| } | } |
| static void split_list(Request& r, StringPtr method_name, | static void split_list(Request& r, const String& method_name, |
| MethodParams& params, int paramIndex, | MethodParams* params, int paramIndex, |
| String& string, | String& string, |
| ArrayString& result) { | ArrayString& result) { |
| Pool& pool=r.pool(); | Value* delim_value=params->as_no_junction(paramIndex, "delimiter must not be code"); |
| ValuePtr delim_value=params.as_no_junction(paramIndex, "delimiter must not be code"); | |
| string.split(result, 0, *delim_value->as_string(&pool)); | string.split(result, 0, *delim_value->as_string()); |
| } | } |
| #define SPLIT_LEFT 0x0001 | #define SPLIT_LEFT 0x0001 |
| Line 155 static void split_list(Request& r, Strin | Line 149 static void split_list(Request& r, Strin |
| #define SPLIT_HORIZONTAL 0x0100 | #define SPLIT_HORIZONTAL 0x0100 |
| #define SPLIT_VERTICAL 0x1000 | #define SPLIT_VERTICAL 0x1000 |
| static int split_options(StringPtr options) { | static int split_options(const String& options) { |
| struct Split_option { | struct Split_option { |
| const char* keyL; | const char* keyL; |
| const char* keyU; | const char* keyU; |
| Line 185 static int split_options(StringPtr optio | Line 179 static int split_options(StringPtr optio |
| return result; | return result; |
| } | } |
| static TablePtr split_vertical(Request& r, StringPtr string, ArrayString& pieces, bool right) { | static Table* split_vertical(Request& r, const String& string, ArrayString& pieces, bool right) { |
| Pool& pool=r.pool(); | |
| Table::columns_type columns(new ArrayString); | Table::columns_type columns(new ArrayString); |
| *columns+=StringPtr(new String("piece")); | *columns+=String* (new String("piece")); |
| TablePtr table(new Table(string, columns, pieces.count())); | Table* table(new Table(string, columns, pieces.count())); |
| if(right) { // right | if(right) { // right |
| for(int i=pieces.count(); --i>=0; ) { | for(int i=pieces.count(); --i>=0; ) { |
| Table::element_type row(new ArrayString); | Table::element_type row(new ArrayString); |
| Line 199 static TablePtr split_vertical(Request& | Line 192 static TablePtr split_vertical(Request& |
| *table+=row; | *table+=row; |
| } | } |
| } else { // left | } else { // left |
| Array_iterator<StringPtr> i(pieces); | Array_iterator<String*> i(pieces); |
| while(i.has_next()) { | while(i.has_next()) { |
| Table::element_type row(new ArrayString); | Table::element_type row(new ArrayString); |
| *row+=i.next(); | *row+=i.next(); |
| Line 210 static TablePtr split_vertical(Request& | Line 203 static TablePtr split_vertical(Request& |
| return table; | return table; |
| } | } |
| static TablePtr split_horizontal(Request& r, StringPtr string, ArrayString& pieces, bool right) { | static Table* split_horizontal(Request& r, const String& string, ArrayString& pieces, bool right) { |
| Pool& pool=r.pool(); | |
| TablePtr table(new Table(string, Table::columns_type(0) /* nameless */)); | Table* table(new Table(string, Table::columns_type(0) /* nameless */)); |
| Table::element_type row(new ArrayString(pieces.count())); | Table::element_type row(new ArrayString(pieces.count())); |
| if(right) { // right | if(right) { // right |
| for(int i=pieces.count(); --i>=0; ) { | for(int i=pieces.count(); --i>=0; ) { |
| *row+=pieces[i]; | *row+=pieces[i]; |
| } | } |
| } else { // left | } else { // left |
| Array_iterator<StringPtr> i(pieces); | Array_iterator<String*> i(pieces); |
| while(i.has_next()) { | while(i.has_next()) { |
| *row+=i.next(); | *row+=i.next(); |
| } | } |
| Line 230 static TablePtr split_horizontal(Request | Line 222 static TablePtr split_horizontal(Request |
| return table; | return table; |
| } | } |
| static void split_with_options(Request& r, StringPtr method_name, MethodParams& params, | static void split_with_options(Request& r, const String& method_name, MethodParams* params, |
| int bits) { | int bits) { |
| Pool& pool=r.pool(); | const String& string=GET_SELF(r, VString).string(); |
| StringPtr string=GET_SELF(r, VString).string(); | |
| ArrayString pieces; | ArrayString pieces; |
| split_list(r, method_name, params, 0, *string, pieces); | split_list(r, method_name, params, 0, *string, pieces); |
| if(!bits) { | if(!bits) { |
| StringPtr options(0); | const String& options(0); |
| if(params.count()>1) { | if(params->count()>1) { |
| options=params.as_string(1, "options must not be code"); | options=params->as_string(1, "options must not be code"); |
| } | } |
| bits=split_options(options); | bits=split_options(options); |
| } | } |
| bool right=(bits & SPLIT_RIGHT) != 0; | bool right=(bits & SPLIT_RIGHT) != 0; |
| bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; | bool horizontal=(bits & SPLIT_HORIZONTAL) !=0; |
| TablePtr table=horizontal?split_horizontal(r, string, pieces, right) | Table* table=horizontal?split_horizontal(r, string, pieces, right) |
| :split_vertical(r, string, pieces, right); | :split_vertical(r, string, pieces, right); |
| r.write_no_lang(ValuePtr(new VTable(table))); | r.write_no_lang(Value*(new VTable(table))); |
| } | } |
| static void _split(Request& r, StringPtr method_name, MethodParams& params) { | static void _split(Request& r, const String& method_name, MethodParams* params) { |
| split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); | split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */); |
| } | } |
| static void _lsplit(Request& r, StringPtr method_name, MethodParams& params) { | static void _lsplit(Request& r, const String& method_name, MethodParams* params) { |
| split_with_options(r, method_name, params, SPLIT_LEFT); | split_with_options(r, method_name, params, SPLIT_LEFT); |
| } | } |
| static void _rsplit(Request& r, StringPtr method_name, MethodParams& params) { | static void _rsplit(Request& r, const String& method_name, MethodParams* params) { |
| split_with_options(r, method_name, params, SPLIT_RIGHT); | split_with_options(r, method_name, params, SPLIT_RIGHT); |
| } | } |
| static void search_action(TablePtr table, Table::element_type row, int, int, int, int, void *) { | static void search_action(Table* table, Table::element_type row, int, int, int, int, void *) { |
| if(row) | if(row) |
| *table+=row; | *table+=row; |
| } | } |
| Line 271 static void search_action(TablePtr table | Line 262 static void search_action(TablePtr table |
| #ifndef DOXYGEN | #ifndef DOXYGEN |
| struct Replace_action_info { | struct Replace_action_info { |
| Request *request; | Request *request; |
| StringPtr origin; | const String& origin; |
| StringPtr src; String* dest; | const String& src; String* dest; |
| VTablePtr vtable; | VTable* vtable; |
| ValuePtr replacement_code; | Value* replacement_code; |
| }; | }; |
| #endif | #endif |
| /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this | /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this |
| static void replace_action(TablePtr table, ArrayStringPtr row, | static void replace_action(Table* table, ArrayString& row, |
| int prestart, int prefinish, | int prestart, int prefinish, |
| int poststart, int postfinish, | int poststart, int postfinish, |
| void *info) { | void *info) { |
| Line 302 static void replace_action(TablePtr tabl | Line 293 static void replace_action(TablePtr tabl |
| } | } |
| /// @todo use pcre:study somehow | /// @todo use pcre:study somehow |
| static void _match(Request& r, StringPtr method_name, MethodParams& params) { | static void _match(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | Value* regexp=params->as_no_junction(0, "regexp must not be code"); |
| ValuePtr regexp=params.as_no_junction(0, "regexp must not be code"); | |
| const String& options= | |
| StringPtr options= | params->count()>1? |
| params.count()>1? | params->as_no_junction(1, "options must not be code")->as_string():0; |
| params.as_no_junction(1, "options must not be code")->as_string(&pool):StringPtr(0); | |
| Temp_lang temp_lang(r, String::L_PASS_APPENDED); | |
| Temp_lang temp_lang(r, String::UL_PASS_APPENDED); | const String& src=GET_SELF(r, VString).string(); |
| StringPtr src=GET_SELF(r, VString).string(); | bool just_matched; |
| if(params.count()<3) { // search | if(params->count()<3) { // search |
| bool was_global; | Table* table=src->match(r.charsets.source(), |
| TablePtr table=src->match(r.charsets.source(), | |
| method_name, | method_name, |
| *regexp->as_string(&pool), options, | *regexp->as_string(), options, |
| search_action, 0, | search_action, 0, |
| &was_global); | just_matched); |
| ValuePtr result; | Value* result; |
| // matched | if(table) |
| // not (just matched[3=pre/match/post], no substrings) or Global search | result=Value*(new VTable(table)); // table of pre/match/post+substrings |
| if(table->columns()->count()>3 || was_global) | |
| result=ValuePtr(new VTable(table/*TODO: clone this when table would be stacked!*/)); // table of pre/match/post+substrings | |
| else | else |
| result=ValuePtr(new VBool(table)); | result=Value*(new VBool(just_matched)); |
| r.write_assign_lang(result); | r.write_assign_lang(result); |
| } else { // replace | } else { // replace |
| ValuePtr replacement_code=params.as_junction(2, "replacement param must be code"); | Value* replacement_code=params->as_junction(2, "replacement param must be code"); |
| String result; | String result; |
| VTablePtr vtable(new VTable); | VTable* vtable(new VTable); |
| Replace_action_info info; | Replace_action_info info; |
| info.request=&r; | info.request=&r; |
| info.origin=method_name; | info.origin=method_name; |
| Line 345 static void _match(Request& r, StringPtr | Line 333 static void _match(Request& r, StringPtr |
| src->match(r.charsets.source(), | src->match(r.charsets.source(), |
| method_name, | method_name, |
| *r.process_to_string(regexp), options, | *r.process_to_string(regexp), options, |
| replace_action, &info); | replace_action, &info, |
| just_matched); | |
| r.write_assign_lang(result); | r.write_assign_lang(result); |
| } | } |
| } | } |
| static void change_case(Request& r, StringPtr method_name, MethodParams& params, | static void change_case(Request& r, const String& method_name, MethodParams* params, |
| String::Change_case_kind kind) { | String::Change_case_kind kind) { |
| Pool& pool=r.pool(); | const String& src=GET_SELF(r, VString).string(); |
| StringPtr src=GET_SELF(r, VString).string(); | |
| r.write_assign_lang(*src->change_case(pool, r.charsets.source(), kind)); | r.write_assign_lang(*src->change_case(r.charsets.source(), kind)); |
| } | } |
| static void _upper(Request& r, StringPtr method_name, MethodParams& params) { | static void _upper(Request& r, const String& method_name, MethodParams* params) { |
| change_case(r, method_name, params, String::CC_UPPER); | change_case(r, method_name, params, String::CC_UPPER); |
| } | } |
| static void _lower(Request& r, StringPtr method_name, MethodParams& params) { | static void _lower(Request& r, const String& method_name, MethodParams* params) { |
| change_case(r, method_name, params, String::CC_LOWER); | change_case(r, method_name, params, String::CC_LOWER); |
| } | } |
| #ifndef DOXYGEN | #ifndef DOXYGEN |
| class String_sql_event_handlers: public SQL_Driver_query_event_handlers { | class String_sql_event_handlers: public SQL_Driver_query_event_handlers { |
| //Pool& pool; | const String& statement_string; const char* statement_cstr; |
| StringPtr statement_string; const char* statement_cstr; | |
| bool got_column; | bool got_column; |
| public: | public: |
| bool got_cell; | bool got_cell; |
| StringPtr result; | const String& result; |
| public: | public: |
| String_sql_event_handlers(//Pool& apool, | String_sql_event_handlers( |
| StringPtr astatement_string, const char* astatement_cstr): | const String& astatement_string, const char* astatement_cstr): |
| //pool(apool), | statement_string(astatement_string), statement_cstr(astatement_cstr), |
| statement_string(astatement_string), | got_column(false), |
| statement_cstr(astatement_cstr), | got_cell(false), |
| result(new String) {} | result(new String) {} |
| bool add_column(SQL_Error& error, void *ptr, size_t size) { | bool add_column(SQL_Error& error, void *ptr, size_t size) { |
| Line 411 public: | Line 398 public: |
| } | } |
| }; | }; |
| #endif | #endif |
| extern StringPtr sql_limit_name; | extern const String& sql_limit_name; |
| extern StringPtr sql_offset_name; | extern const String& sql_offset_name; |
| extern StringPtr sql_default_name; | extern const String& sql_default_name; |
| extern StringPtr sql_distinct_name; | extern const String& sql_distinct_name; |
| StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params, | const String& sql_result_string(Request& r, const String& method_name, MethodParams* params, |
| HashStringValue*& options, ValuePtr& default_code) { | HashStringValue*& options, Value*& default_code) { |
| Pool& pool=r.pool(); | |
| ValuePtr statement=params.as_junction(0, "statement must be code"); | Value* statement=params->as_junction(0, "statement must be code"); |
| ulong limit=0; | ulong limit=0; |
| ulong offset=0; | ulong offset=0; |
| default_code=ValuePtr(0); | default_code=0; |
| if(params.count()>1) { | if(params->count()>1) { |
| ValuePtr voptions=params.as_no_junction(1, "options must be hash, not code"); | Value* voptions=params->as_no_junction(1, "options must be hash, not code"); |
| if(!voptions->is_string()) | if(!voptions->is_string()) |
| if(options=voptions->get_hash(method_name)) { | if(options=voptions->get_hash(method_name)) { |
| if(ValuePtr vlimit=options->get(sql_limit_name)) | if(Value* vlimit=options->get(sql_limit_name)) |
| limit=(ulong)r.process_to_value(vlimit)->as_double(); | limit=(ulong)r.process_to_value(vlimit)->as_double(); |
| if(ValuePtr voffset=options->get(sql_offset_name)) | if(Value* voffset=options->get(sql_offset_name)) |
| offset=(ulong)r.process_to_value(voffset)->as_double(); | offset=(ulong)r.process_to_value(voffset)->as_double(); |
| if(default_code=options->get(sql_default_name)) { | if(default_code=options->get(sql_default_name)) { |
| if(JunctionPtr default_junction=default_code->get_junction()) | if(Junction* default_junction=default_code->get_junction()) |
| ;//default_junction->change_context(statement.get_junction()); | ;//default_junction->change_context(statement.get_junction()); |
| else | else |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| Line 447 StringPtr sql_result_string(Request& r, | Line 433 StringPtr sql_result_string(Request& r, |
| } else | } else |
| options=0; | options=0; |
| Temp_lang temp_lang(r, String::UL_SQL); | Temp_lang temp_lang(r, String::L_SQL); |
| StringPtr statement_string=r.process_to_string(statement); | const String& statement_string=r.process_to_string(statement); |
| const char* statement_cstr= | const char* statement_cstr= |
| statement_string->cstr(pool, String::UL_UNSPECIFIED, r.connection(method_name)); | statement_string->cstr(String::L_UNSPECIFIED, r.connection(method_name)); |
| String_sql_event_handlers handlers(statement_string, statement_cstr); | String_sql_event_handlers handlers(statement_string, statement_cstr); |
| r.connection(method_name)->query( | r.connection(method_name)->query( |
| statement_cstr, offset, limit, | statement_cstr, offset, limit, |
| Line 463 StringPtr sql_result_string(Request& r, | Line 449 StringPtr sql_result_string(Request& r, |
| return handlers.result; | return handlers.result; |
| } | } |
| static void _sql(Request& r, StringPtr method_name, MethodParams& params) { | static void _sql(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | |
| HashStringValue* options; | HashStringValue* options; |
| ValuePtr default_code; | Value* default_code; |
| StringPtr string=sql_result_string(r, method_name, params, options, default_code); | const String& string=sql_result_string(r, method_name, params, options, default_code); |
| if(!string) { | if(!string) { |
| if(default_code) { | if(default_code) { |
| string=r.process_to_string(default_code); | string=r.process_to_string(default_code); |
| if(!string) | if(!string) |
| string=StringPtr(new String); | string=String* (new String); |
| } else | } else |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| method_name, | method_name, |
| Line 483 static void _sql(Request& r, StringPtr m | Line 468 static void _sql(Request& r, StringPtr m |
| r.write_assign_lang(*string); | r.write_assign_lang(*string); |
| } | } |
| static void _replace(Request& r, StringPtr method_name, MethodParams& params) { | static void _replace(Request& r, const String& method_name, MethodParams* params) { |
| Pool& pool=r.pool(); | const String& src=GET_SELF(r, VString).string(); |
| StringPtr src=GET_SELF(r, VString).string(); | |
| Table* table=params.as_no_junction(0, "parameter must not be code")->get_table(); | Table* table=params->as_no_junction(0, "parameter must not be code")->get_table(); |
| if(!table) | if(!table) |
| throw Exception("parser.runtime", | throw Exception("parser.runtime", |
| method_name, | method_name, |
| "parameter must be table"); | "parameter must be table"); |
| Dictionary dict2(TablePtr(table), 1/*am not sure why using the =default parameter causes compile errors in replace*/ ); | Table* tp(table); |
| r.write_assign_lang(*src->replace(pool, dict2)); | Dictionary dict2(tp, 1/*am not sure why using the =default parameter causes compile errors in replace*/ ); |
| r.write_assign_lang(*src->replace(dict2)); | |
| } | } |
| static void _save(Request& r, StringPtr method_name, MethodParams& params) { | static void _save(Request& r, const String& method_name, MethodParams* params) { |
| StringPtr file_name=params.as_string(params.count()-1, | const String& file_name=params->as_string(params->count()-1, |
| "file name must be string"); | "file name must be string"); |
| StringPtr src=GET_SELF(r, VString).string(); | const String& src=GET_SELF(r, VString).string(); |
| bool do_append=false; | bool do_append=false; |
| if(params.count()>1) { | if(params->count()>1) { |
| StringPtr mode=params.as_string(0, "mode must be string"); | const String& mode=params->as_string(0, "mode must be string"); |
| if(*mode=="append") | if(*mode=="append") |
| do_append=true; | do_append=true; |
| else | else |
| Line 515 static void _save(Request& r, StringPtr | Line 500 static void _save(Request& r, StringPtr |
| } | } |
| // write | // write |
| CharPtr buf=src->cstr(String::UL_UNSPECIFIED, r.connection(StringPtr(0)/*no error if none*/)); | const char* buf=src->cstr(String::L_UNSPECIFIED, r.connection(0/*no error if none*/)); |
| file_write(r.absolute(file_name), | file_write(r.absolute(file_name), |
| buf, strlen(buf), true, do_append); | buf, strlen(buf), true, do_append); |
| } | } |
| static void _normalize(Request& r, StringPtr method_name, MethodParams& /*params*/) { | static void _normalize(Request& r, const String& method_name, MethodParams* /*params*/) { |
| StringPtr src=GET_SELF(r, VString).string(); | const String& src=GET_SELF(r, VString).string(); |
| r.write_assign_lang(*src->join_chains(r.pool())); | r.write_assign_lang(*src->join_chains(r.pool())); |
| } | } |