--- parser3/src/classes/string.C	2001/07/23 11:19:25	1.65
+++ parser3/src/classes/string.C	2001/08/02 09:58:33	1.69
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: string.C,v 1.65 2001/07/23 11:19:25 parser Exp $"; 
+static const char *RCSId="$Id: string.C,v 1.69 2001/08/02 09:58:33 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -124,10 +124,10 @@ static void _lsplit(Request& r, const St
 
 	Table& table=*new(pool) Table(pool, &string, 
 		&columns, pieces.size());
-	int size=pieces.quick_size();
-	for(int i=0; i<size; i++) {
+	Array_iter i(pieces);
+	while(i.has_next()) {
 		Array& row=*new(pool) Array(pool);
-		row+=pieces.quick_get(i);
+		row+=i.next();
 		table+=&row;
 	}
 	r.write_no_lang(*new(pool) VTable(pool, &table));
@@ -183,9 +183,10 @@ static void replace_action(Table& table,
 			vtable.set_name(*ai.origin);
 
 			Junction *junction=ai.replacement_code->get_junction();
-			junction->rcontext=/*must be some way to get to 
-							   outside world junction->root=*/&vtable;
+			Value *saved_match_var_value=junction->root->get_element(*match_var_name);
+			junction->root->put_element(*match_var_name, &vtable);
 			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
+			junction->root->put_element(*match_var_name, saved_match_var_value);
 
 			/*
 			ai.dest->APPEND_CONST("(");
@@ -313,8 +314,6 @@ const String* sql_result_string(Request&
 
 	Value& statement=params->as_junction(0, "statement must be code");
 
-	ulong offset=(ulong)(params->size()>2?params->as_int(2, r):0);
-
 	Temp_lang temp_lang(r, String::UL_SQL);
 	const String& statement_string=r.process(statement).as_string();
 	const char *statement_cstr=
@@ -323,7 +322,7 @@ const String* sql_result_string(Request&
 	bool need_rethrow=false; Exception rethrow_me;
 	PTRY {
 		r.connection->query(
-			statement_cstr, offset, 0,
+			statement_cstr, 0, 0,
 			handlers);
 	}
 	PCATCH(e) { // query problem
@@ -346,11 +345,16 @@ static void _sql(Request& r, const Strin
 
 	const String *string=sql_result_string(r, method_name, params);
 	if(!string) {
-		Value& default_code=params->as_junction(1, "default result must code");
-		Value& processed_code=r.process(default_code);
-		string=processed_code.get_string();
-		if(!string)
-			string=empty_string;
+		if(params->size()>1) {
+			Value& default_code=params->as_junction(1, "default result must code");
+			Value& processed_code=r.process(default_code);
+			string=processed_code.get_string();
+			if(!string)
+				string=empty_string;
+		} else
+			PTHROW(0, 0,
+				&method_name,
+				"produced no result, but no default specified");
 	}
 	VString& result=*new(pool) VString(*string);
 	result.set_name(method_name);
@@ -399,9 +403,9 @@ MString::MString(Pool& apool) : Methoded
 	// ^string.tolower[]
 	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);
 
+	// ^string:sql[query]
 	// ^string:sql[query]{default}
-	// ^string:sql[query]{default}(offset)
-	add_native_method("sql", Method::CT_STATIC, _sql, 2, 3);
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }	
 
 // global variable