--- parser3/src/classes/table.C 2002/03/15 10:08:13 1.145 +++ parser3/src/classes/table.C 2002/04/10 09:53:14 1.147 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: table.C,v 1.145 2002/03/15 10:08:13 paf Exp $ + $Id: table.C,v 1.147 2002/04/10 09:53:14 paf Exp $ */ #include "classes.h" @@ -46,7 +46,7 @@ static void _create(Request& r, const St // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& data= - r.process(params->as_junction(params->size()-1, "body must be code")).as_string(); + r.process_to_string(params->as_junction(params->size()-1, "body must be code")); size_t pos_after=0; // parse columns @@ -140,7 +140,7 @@ static void _load(Request& r, const Stri static_cast(r.self)->set_table(table); } -/// @todo "z\nz" "zzz""zz" +/// @todo "x\nx" "xxx""xx" static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& vfile_name=params->as_no_junction(params->size()-1, @@ -178,7 +178,7 @@ static void _save(Request& r, const Stri else if(mode=="nameless") /*ok, already skipped names output*/; else - throw Exception(0, 0, + throw Exception("parser.runtime", &mode, "unknown mode, must be 'append'"); @@ -227,13 +227,13 @@ static void _offset(Request& r, const St else if(whence=="set") absolute=true; else - throw Exception(0, 0, + throw Exception("parser.runtime", &whence, "is invalid whence, valid are 'cur' or 'set'"); } Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression"); - table.offset(absolute, r.process(offset_expr).as_int()); + table.offset(absolute, r.process_to_value(offset_expr).as_int()); } else { Value& value=*new(pool) VInt(pool, table.current()); value.set_name(method_name); @@ -254,11 +254,11 @@ static void _menu(Request& r, const Stri for(int row=0; rowsize()) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); + r.write_pass_lang(r.process_to_string(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -315,7 +315,7 @@ static void _hash(Request& r, const Stri value_fields+=self_table.column_name2index(value_field_name, true); } } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "value field(s) must be string or self_table" ); @@ -379,7 +379,7 @@ static void _sort(Request& r, const Stri old_table.set_current(i); // calculate key value seq[i].row=(MethodParams *)old_table.get(i); - Value& value=*r.process(key_maker).as_expr_result(true/*return string as-is*/); + Value& value=*r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/); if(i==0) // determining key values type by first one key_values_are_strings=value.is_string(); @@ -404,7 +404,7 @@ static void _sort(Request& r, const Stri static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) { if(params->size()>1) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "locate by expression has only one parameter - expression"); @@ -417,7 +417,7 @@ static bool _locate_expression(Request& for(int row=0; rowsize()>2) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "locate by name and value has only two parameters - name and value"); @@ -471,7 +471,7 @@ static void _append(Request& r, const St // data Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& string= - r.process(params->as_junction(0, "body must be code")).as_string(); + r.process_to_string(params->as_junction(0, "body must be code")); // parse cells Array& row=*new(pool) Array(pool); @@ -486,14 +486,14 @@ static void _join(Request& r, const Stri Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source is not a table"); Table& src=*maybe_src; Table& dest=static_cast(r.self)->table(); if(&src == &dest) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "source and destination are same table"); @@ -574,17 +574,17 @@ static void _sql(Request& r, const Strin if(voptions.is_defined()) if(Hash *options=voptions.get_hash(&method_name)) { if(Value *vlimit=(Value *)options->get(*sql_limit_name)) - limit=(ulong)r.process(*vlimit).as_double(); + limit=(ulong)r.process_to_value(*vlimit).as_double(); if(Value *voffset=(Value *)options->get(*sql_offset_name)) - offset=(ulong)r.process(*voffset).as_double(); + offset=(ulong)r.process_to_value(*voffset).as_double(); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "options must be hash"); } Temp_lang temp_lang(r, String::UL_SQL); - const String& statement_string=r.process(statement).as_string(); + const String& statement_string=r.process_to_string(statement); const char *statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, @@ -611,7 +611,7 @@ static void _sql(Request& r, const Strin #endif } catch(const Exception& e) { // query problem // more specific source [were url] - throw Exception(e.type(), e.code(), + throw Exception("sql.execute", &statement_string, "%s", e.comment()); }