--- parser3/src/classes/string.C	2012/06/08 11:44:02	1.205
+++ parser3/src/classes/string.C	2013/10/17 21:52:32	1.211
@@ -20,7 +20,7 @@
 #include "pa_vregex.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_STRING_C="$Id: string.C,v 1.205 2012/06/08 11:44:02 misha Exp $";
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.211 2013/10/17 21:52:32 moko Exp $";
 
 // class
 
@@ -67,35 +67,44 @@ static void _length(Request& r, MethodPa
 static void _int(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	int converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		converted=self_string.as_int();
-	} catch(...) { // convert problem
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_int(0, "default must be int", r); // (default)
 		else
-			rethrow; // we have a problem when no default			
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else {
+		try {
+			converted=self_string.as_int();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_int(0, "default must be int", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
+
 	r.write_no_lang(*new VInt(converted));
 }
 
 static void _double(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	double converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		converted=self_string.as_double();
-	} catch(...) { // convert problem
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_double(0, "default must be double", r); // (default)
 		else
-			rethrow; // we have a problem when no default
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else {
+		try {
+			converted=self_string.as_double();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_double(0, "default must be double", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
 
 	r.write_no_lang(*new VDouble(converted));
@@ -104,29 +113,28 @@ static void _double(Request& r, MethodPa
 static void _bool(Request& r, MethodParams& params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	bool converted;
-	try {
-		if(self_string.is_empty())
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"unable to convert empty string without default specified");
-		
-		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
+	const char *str=self_string.cstr();
+
+	if(self_string.is_empty()) {
 		if(params.count()>0)
 			converted=params.as_bool(0, "default must be bool", r); // (default)
 		else
-			rethrow; // we have a problem when no default
+			throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified");
+	} else if( (str[0]=='T' || str[0]=='t') && (str[1]=='R' || str[1]=='r') && (str[2]=='U' || str[2]=='u') &&
+		   (str[3]=='E' || str[3]=='e') && str[4]==0 ) { // "true"
+		converted=true;
+	} else if( (str[0]=='F' || str[0]=='f') && (str[1]=='A' || str[1]=='a') && (str[2]=='L' || str[2]=='l') &&
+		   (str[3]=='S' || str[3]=='s') && (str[4]=='E' || str[4]=='e') && str[5]==0 ) { // "false"
+		converted=false;
+	} else {
+		try {
+			converted=self_string.as_bool();
+		} catch(...) { // convert problem
+			if(params.count()>0)
+				converted=params.as_bool(0, "default must be bool", r); // (default)
+			else
+				rethrow; // we have a problem when no default
+		}
 	}
 
 	r.write_no_lang(VBool::get(converted));
@@ -446,7 +454,7 @@ static void _match(Request& r, MethodPar
 		};
 
 		if(is_junction){
-			Temp_value_element temp( *replacement_code->get_junction()->method_frame, match_var_name, vtable);
+			Temp_value_element temp(r, *replacement_code->get_junction()->method_frame, match_var_name, vtable);
 			src.match(vregex, replace_action, &info, matches_count);
 		} else {
 			src.match(vregex, replace_action, &info, matches_count);
@@ -478,14 +486,14 @@ class String_sql_event_handlers: public
 	bool got_column;
 public:
 	bool got_cell;
-	String& result;
+	const String* result;
 public:
 	String_sql_event_handlers(
 		const String& astatement_string, const char* astatement_cstr):
 		statement_string(astatement_string), statement_cstr(astatement_cstr),
 		got_column(false),
 		got_cell(false),
-		result(*new String) {}
+		result(&String::Empty) {}
 
 	bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) {
 		if(got_column) {
@@ -499,7 +507,7 @@ public:
 	}
 	bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; }
 	bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; }
-	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
+	bool add_row_cell(SQL_Error& error, const char* str, size_t) {
 		if(got_cell) {
 			error=SQL_Error(PARSER_RUNTIME,
 				//statement_string,
@@ -509,7 +517,7 @@ public:
 
 		try {
 			got_cell=true;
-			result.append_know_length(str, length, String::L_TAINTED);
+			result=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */ );
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell");
@@ -579,7 +587,7 @@ const String* sql_result_string(Request&
 	if(!handlers.got_cell)
 		return 0; // no lines, caller should return second param[default value]
 
-	return &handlers.result;
+	return handlers.result;
 }
 
 static void _sql(Request& r, MethodParams& params) {
@@ -651,7 +659,7 @@ static void _save(Request& r, MethodPara
 	const String& file_name=params.as_string(file_name_index, FILE_NAME_MUST_BE_STRING);
 	const String& src=GET_SELF(r, VString).string();
 
-	String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/));
+	String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets);
 
 	// write
 	file_write(r.charsets, r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append, asked_charset);