--- parser3/src/classes/string.C	2007/11/27 10:51:01	1.158
+++ parser3/src/classes/string.C	2008/07/17 09:11:35	1.164
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2007/11/27 10:51:01 $";
+static const char * const IDENT_STRING_C="$Date: 2008/07/17 09:11:35 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -36,9 +36,9 @@ DECLARE_CLASS_VAR(string, new MString, 0
 // defines for statics
 
 #define MATCH_VAR_NAME "match"
-#define TRIM_START_OPTION "start"
+#define TRIM_START_OPTION "left"
+#define TRIM_END_OPTION "right"
 #define TRIM_BOTH_OPTION "both"
-#define TRIM_END_OPTION "end"
 
 // statics
 
@@ -47,7 +47,7 @@ static const String match_var_name(MATCH
 // methods
 
 static void _length(Request& r, MethodParams&) {
-	double result=GET_SELF(r, VString).string().length();
+	double result=GET_SELF(r, VString).string().length(r.charsets.source());
 	r.write_no_lang(*new VDouble(result));
 }
 
@@ -125,7 +125,7 @@ static void _bool(Request& r, MethodPara
 	// for some time due to stupid {} in original design
 	const String& fmt=r.process_to_string(fmt_maybe_code);
 
-	const char* buf=format(r.get_self().as_double(), fmt.cstrm());
+	const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm());
 
 	r.write_no_lang(String(buf));
 }
@@ -139,7 +139,7 @@ static void _left(Request& r, MethodPara
 	size_t n=(size_t)sn;
 
 	const String& string=GET_SELF(r, VString).string();
-	r.write_assign_lang(string.mid(0, n));
+	r.write_assign_lang(string.mid(r.charsets.source(), 0, n));
 }
 
 static void _right(Request& r, MethodParams& params) {
@@ -149,11 +149,10 @@ static void _right(Request& r, MethodPar
 			0, 
 			"n(%d) must be >=0", sn);
 	size_t n=(size_t)sn;
-	
-	
+
 	const String& string=GET_SELF(r, VString).string();
-	size_t length=string.length();
-	r.write_assign_lang(n<length?string.mid(length-n, string.length()):string);
+	size_t length=string.length(r.charsets.source());
+	r.write_assign_lang(n<length?string.mid(r.charsets.source(), length-n, length, length):string);
 }
 
 static void _mid(Request& r, MethodParams& params) {
@@ -167,6 +166,7 @@ static void _mid(Request& r, MethodParam
 	size_t begin=(size_t)sbegin;
 
 	size_t end;
+	size_t length=0;
 	if(params.count()>1) {
 		ssize_t sn=params.as_int(1, "n must be int", r);
 		if(sn<0)
@@ -174,17 +174,19 @@ static void _mid(Request& r, MethodParam
 				0, 
 				"n(%d) must be >=0", sn);
 		end=begin+(size_t)sn;
-	} else 
-		end=string.length();
-	
-	r.write_assign_lang(string.mid(begin, end));
+	} else {
+		length=string.length(r.charsets.source());
+		end=length;
+	}
+
+	r.write_assign_lang(string.mid(r.charsets.source(), begin, end, length));
 }
 
 static void _pos(Request& r, MethodParams& params) {
 	Value& substr=params.as_no_junction(0, "substr must not be code");
 	
 	const String& string=GET_SELF(r, VString).string();
-	r.write_assign_lang(*new VInt((int)string.pos(substr.as_string())));
+	r.write_assign_lang(*new VInt((int)string.pos(r.charsets.source(), substr.as_string())));
 }
 
 static void split_list(MethodParams& params, int paramIndex,
@@ -367,7 +369,7 @@ static void _match(Request& r, MethodPar
 			matches_count);
 		// r.write_assign_lang(*new VTable(table));
 		if(table){
-		r.write_assign_lang(*new VTable(table));
+			r.write_assign_lang(*new VTable(table));
 		} else {
 			r.write_assign_lang(*new VInt(matches_count));
 		}
@@ -467,7 +469,7 @@ const String* sql_result_string(Request&
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
-	ulong limit=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	default_code=0;
 	if(params.count()>1) {
@@ -511,6 +513,7 @@ const String* sql_result_string(Request&
 	const char* statement_cstr=
 		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
 	String_sql_event_handlers handlers(statement_string, statement_cstr);
+
 	r.connection()->query(
 		statement_cstr, 
 		placeholders_count, placeholders,
@@ -594,12 +597,12 @@ static void _trim(Request& r, MethodPara
 		const String& skind=params.as_string(0, 
 			"'where' must be string");
 		if(skind.length())
-			if(skind==TRIM_START_OPTION)
+			if(skind==TRIM_BOTH_OPTION)
+				kind=String::TRIM_BOTH;
+			else if(skind==TRIM_START_OPTION || skind=="start")
 				kind=String::TRIM_START;
-			else if(skind==TRIM_END_OPTION)
+			else if(skind==TRIM_END_OPTION || skind=="end")
 				kind=String::TRIM_END;
-			else if(skind==TRIM_BOTH_OPTION)
-				kind=String::TRIM_BOTH;
 			else
 				throw Exception(PARSER_RUNTIME,
 					&skind,