--- parser3/src/classes/string.C	2001/11/09 11:59:13	1.89
+++ parser3/src/classes/string.C	2002/03/27 15:30:34	1.98
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: string.C,v 1.89 2001/11/09 11:59:13 paf Exp $
+	$Id: string.C,v 1.98 2002/03/27 15:30:34 paf Exp $
 */
 
 #include "classes.h"
@@ -80,11 +80,12 @@ static void _double(Request& r, const St
 /*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& fmt=params->as_junction(0, "fmt must be code");
+	Value& fmt_maybe_code=params->get(0);
+	// for some time due to stupid {} in original design
+	const String& fmt=
+		(fmt_maybe_code.get_junction()?r.process(fmt_maybe_code):fmt_maybe_code).as_string();
 
-	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	char *buf=format(pool, r.self->as_double(), 
-		r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED));
+	char *buf=format(pool, r.self->as_double(), fmt.cstr());
 
 	String result(pool);
 	result.APPEND_CLEAN(buf, 0, 
@@ -245,7 +246,7 @@ static void _match(Request& r, const Str
 	Table *table;
 	if(params->size()<3) { // search
 		bool was_global;
-		bool matched=src.match(r.pcre_tables(),
+		bool matched=src.match(
 			&method_name, 
 			regexp.as_string(), options,
 			&table,
@@ -258,7 +259,7 @@ static void _match(Request& r, const Str
 		else 
 			result=new(pool) VBool(pool, matched);			
 	} else { // replace
-		Value& replacement_code=params->as_junction(2, "replacement code must be code");
+		Value& replacement_code=params->as_junction(2, "replacement param must be code");
 
 		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={
@@ -267,7 +268,7 @@ static void _match(Request& r, const Str
 			&replacement_code,
 			&src
 		};
-		src.match(r.pcre_tables(),
+		src.match(
 			&method_name, 
 			r.process(regexp).as_string(), options,
 			&table,
@@ -283,7 +284,7 @@ static void change_case(Request& r, cons
 	Pool& pool=r.pool();
 	const String& src=*static_cast<VString *>(r.self)->get_string();
 
-	r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(),
+	r.write_assign_lang(*new(pool) VString(src.change_case(pool, 
 		kind)));
 }
 static void _upper(Request& r, const String& method_name, MethodParams *params) {
@@ -307,7 +308,7 @@ public:
 
 	void add_column(void *ptr, size_t size) {
 		if(got_column)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&statement_string,
 				"result must contain exactly one column");
 		got_column=true;
@@ -316,7 +317,7 @@ public:
 	void add_row() { /* ignore */ }
 	void add_row_cell(void *ptr, size_t size) {
 		if(got_cell)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&statement_string,
 				"result must not contain more then one row");
 		got_cell=true;
@@ -337,11 +338,6 @@ const String* sql_result_string(Request&
 								Hash *& options, Value *& default_code) {
 	Pool& pool=r.pool();
 
-	if(!r.connection)
-		throw Exception(0, 0,
-			&method_name,
-			"without connect");
-
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
@@ -357,12 +353,12 @@ const String* sql_result_string(Request&
 					offset=(ulong)r.process(*voffset).as_double();
 				if(default_code=(Value *)options->get(*sql_default_name)) {
 					if(!default_code->get_junction())
-						throw Exception(0, 0,
+						throw Exception("parser.runtime",
 							&method_name,
 							"default option must be code");
 				}
 			} else
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&method_name,
 					"options must be hash");
 	} else
@@ -371,15 +367,15 @@ const String* sql_result_string(Request&
 	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);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	String_sql_event_handlers handlers(pool, statement_string, statement_cstr);
 	try {
-		r.connection->query(
+		r.connection(&method_name)->query(
 			statement_cstr, offset, limit, 
 			handlers);
 	} catch(const Exception& e) { // query problem
 		// give more specific source [were url]
-		throw Exception(e.type(), e.code(),
+		throw Exception("sql.execute",
 			&statement_string, 
 			"%s", e.comment());
 	}
@@ -402,7 +398,7 @@ static void _sql(Request& r, const Strin
 			if(!string)
 				string=new(pool) String(pool);
 		} else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"produced no result, but no default option specified");
 	}
@@ -417,7 +413,7 @@ static void _replace(Request& r, const S
 
 	Table *table=params->as_no_junction(0, "parameter must not be code").get_table();
 	if(!table)
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"parameter must be table");
 
@@ -426,7 +422,6 @@ static void _replace(Request& r, const S
 }
 
 static void _save(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
 	const String& file_name=params->as_string(params->size()-1, 
 		"file name must be string");
 
@@ -438,14 +433,14 @@ static void _save(Request& r, const Stri
 		if(mode=="append")
 			do_append=true;
 		else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&mode,
 				"unknown mode, must be 'append'");
 	}		
 
 	// write
 	const char *buf=src.cstr(String::UL_UNSPECIFIED);
-	file_write(pool, r.absolute(file_name), 
+	file_write(r.absolute(file_name), 
 		buf, strlen(buf), true, do_append);
 }