--- parser3/src/classes/string.C	2007/08/20 10:02:51	1.154
+++ parser3/src/classes/string.C	2008/06/26 15:00:42	1.160
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2007/08/20 10:02:51 $";
+static const char * const IDENT_STRING_C="$Date: 2008/06/26 15:00:42 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -96,7 +96,19 @@ static void _bool(Request& r, MethodPara
 			throw Exception(PARSER_RUNTIME,
 				0,
 				"parameter is empty string, error converting");
-		converted=self_string.as_bool();
+		
+		try {
+			converted=self_string.as_bool();
+		} catch(...) {
+			const String& lower_string=self_string.change_case(r.charsets.source(), String::CC_LOWER);
+			if(lower_string == "true"){
+				converted=true;
+			} else if (lower_string == "false"){
+				converted=false;
+			} else {
+				rethrow;
+			}
+		}
 	} catch(...) { // convert problem
 		if(params.count()>0)
 			converted=params.as_bool(0, "default must be bool", r); // (default)
@@ -113,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));
 }
@@ -137,8 +149,7 @@ 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);
@@ -219,9 +230,9 @@ static int split_options(const String* o
 	return result;
 }
 
-static Table& split_vertical(ArrayString& pieces, bool right) {
+static Table& split_vertical(ArrayString& pieces, bool right, const String* column_name) {
 	Table::columns_type columns(new ArrayString);
-	*columns+=new String("piece");
+	*columns+=column_name;
 
 	Table& table=*new Table(columns, pieces.count());
 	if(right) { // right
@@ -274,8 +285,19 @@ static void split_with_options(Request&
 
 	bool right=(bits & SPLIT_RIGHT) != 0;
 	bool horizontal=(bits & SPLIT_HORIZONTAL) !=0;
-	Table& table=horizontal?split_horizontal(pieces, right)
-		:split_vertical(pieces, right);
+
+	const String* column_name=0;
+	if(params.count()>2){
+		column_name=&params.as_string(2, COLUMN_NAME_MUST_BE_STRING);
+		if (horizontal && column_name->length()) 
+			throw Exception(PARSER_RUNTIME,
+				column_name,
+				"column name can't be specified with horisontal split");
+	} 
+	if(!column_name || !column_name->length())
+		column_name=new String("piece");
+
+	Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name);
 
 	r.write_no_lang(*new VTable(&table));
 }
@@ -344,7 +366,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));
 		}
@@ -444,7 +466,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) {
@@ -457,8 +479,13 @@ const String* sql_result_string(Request&
 					bind=vbind->get_hash();
 				}
 				if(Value* vlimit=options->get(sql_limit_name)) {
-					valid_options++;
-					limit=(ulong)r.process_to_value(*vlimit).as_double();
+					if(vlimit->is_defined()){
+						valid_options++;
+						limit=(ulong)r.process_to_value(*vlimit).as_double();
+					} else
+						throw Exception(PARSER_RUNTIME,
+								0,
+								"limit must be defined");
 				}
 				if(Value* voffset=options->get(sql_offset_name)) {
 					valid_options++;
@@ -488,6 +515,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,
@@ -524,7 +552,7 @@ static void _sql(Request& r, MethodParam
 static void _replace(Request& r, MethodParams& params) {
 	const String& src=GET_SELF(r, VString).string();
 
-	Table* table=params.as_no_junction(0, "parameter must not be code").get_table();
+	Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();
 	if(!table)
 		throw Exception(PARSER_RUNTIME,
 			0,
@@ -596,7 +624,7 @@ static void _append(Request& r, MethodPa
 	// c=a+b
 	VString& va=GET_SELF(r, VString);
 	const String& a=va.string();
-	const String& b=params.as_string(0, "parameter must be string");
+	const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING);
 	String& c=*new String(a);
 	c.append(b, String::L_PASS_APPENDED);
 	va.set_string(c);
@@ -605,7 +633,7 @@ static void _append(Request& r, MethodPa
 static void _base64(Request& r, MethodParams& params) {
 	if(params.count()) {
 		// decode
-		const char* cstr=params.as_string(0, "parameter must be string").cstr();
+		const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
 		char* decoded_cstr=0;
 		size_t decoded_size=0;
 		pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size);
@@ -651,7 +679,8 @@ MString::MString(): Methoded("string") {
 
 	// ^string.split[delim]
 	// ^string.split[delim][options]
-	add_native_method("split", Method::CT_DYNAMIC, _split, 1, 2);
+	// ^string.split[delim][options][column name]
+	add_native_method("split", Method::CT_DYNAMIC, _split, 1, 3);
 		// old names for backward compatibility
 		// ^string.lsplit[delim]
 		add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1);