--- parser3/src/classes/string.C	2001/10/23 14:43:44	1.85
+++ parser3/src/classes/string.C	2002/02/07 11:31:53	1.95
@@ -2,9 +2,9 @@
 	Parser: @b string parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: string.C,v 1.85 2001/10/23 14:43:44 parser Exp $
+	$Id: string.C,v 1.95 2002/02/07 11:31:53 paf Exp $
 */
 
 #include "classes.h"
@@ -80,10 +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());
+	char *buf=format(pool, r.self->as_double(), fmt.cstr());
 
 	String result(pool);
 	result.APPEND_CLEAN(buf, 0, 
@@ -244,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,
@@ -257,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={
@@ -266,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,
@@ -282,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) {
@@ -336,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;
@@ -370,10 +367,10 @@ 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
@@ -425,15 +422,26 @@ static void _replace(Request& r, const S
 }
 
 static void _save(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	Value& vfile_name=params->as_no_junction(0, 
-		"file name must not be code");
+	const String& file_name=params->as_string(params->size()-1, 
+		"file name must be string");
 
 	const String& src=*static_cast<VString *>(r.self)->get_string();
 
+	bool do_append=false;
+	if(params->size()>1) {
+		const String& mode=params->as_string(0, "mode must be string");
+		if(mode=="append")
+			do_append=true;
+		else
+			throw Exception(0, 0,
+				&mode,
+				"unknown mode, must be 'append'");
+	}		
+
 	// write
-	file_write(pool, r.absolute(vfile_name.as_string()), 
-		src.cstr(String::UL_AS_IS), src.size(), true);
+	const char *buf=src.cstr(String::UL_UNSPECIFIED);
+	file_write(r.absolute(file_name), 
+		buf, strlen(buf), true, do_append);
 }
 
 // constructor
@@ -487,7 +495,7 @@ MString::MString(Pool& apool) : Methoded
 	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1);
 
 	// ^string.save[file]  
-	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
 }	
 
 // global variable