--- parser3/src/main/pa_sql_driver_manager.C	2003/12/11 09:22:09	1.78
+++ parser3/src/main/pa_sql_driver_manager.C	2005/08/09 08:14:52	1.85
@@ -1,11 +1,11 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/12/11 09:22:09 $";
+static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2005/08/09 08:14:52 $";
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -15,6 +15,7 @@ static const char * const IDENT_SQL_DRIV
 #include "pa_common.h"
 #include "pa_vhash.h"
 #include "pa_vtable.h"
+#include "pa_charsets.h"
 
 // globals
 
@@ -31,13 +32,60 @@ const String& SQL_Driver_services_impl::
 	String& result=*new String;
 	result << furl->mid(0, furl->pos(':')) << "://****";
 
-	size_t at_pos=furl->pos('@');
-	if(at_pos!=STRING_NOT_FOUND)
+	size_t at_pos=0;
+	size_t new_at_pos;
+	while( (new_at_pos=furl->pos('@', at_pos+1))!=STRING_NOT_FOUND)
+		at_pos=new_at_pos;
+	if(at_pos)
 		result << furl->mid(at_pos, furl->length());
 
 	return result;
 }
 
+void SQL_Driver_services_impl::transcode(const char* src, size_t src_length,
+	const char*& dst, size_t& dst_length,
+	const char* charset_from_name,
+	const char* charset_to_name
+	) 
+{
+	try {
+		// to speed up sql transcode [lots of charsets::get-s -- twice for each cell]
+		// without complicating sql driver API
+		// we need to cache couple of name->charset pairs
+		// assuming pointers to names are are NOT to local vars 
+
+		struct cache_record {
+			const char* name;
+			Charset* object;
+		} cache[2]={{0,0}, {0,0}};
+
+		Charset* charset_from_object;
+		Charset* charset_to_object;
+		if(charset_from_name==cache[0].name) {
+			charset_from_object=cache[0].object;
+		} else {
+			cache[0].name=charset_from_name;
+			cache[0].object=charset_from_object=&charsets.get(charset_from_name);
+		}
+		if(charset_to_name==cache[1].name) {
+			charset_to_object=cache[1].object;
+		} else {
+			cache[1].name=charset_to_name;
+			cache[1].object=charset_to_object=&charsets.get(charset_to_name);
+		}
+
+		String::C result=Charset::transcode(String::C(src, src_length), 
+			*charset_from_object,
+			*charset_to_object);
+		dst=result.str;
+		dst_length=result.length;
+	} catch(const Exception& e) {
+		_throw(SQL_Error(e.type(), e.comment()));
+	} catch(...) {
+		_throw(SQL_Error(0, "unknown error while transcoding in sql driver"));
+	}
+}
+
 // helpers
 
 static void expire_connection(SQL_Connection& connection, time_t older_dies) {
@@ -58,7 +106,7 @@ SQL_Driver_manager::SQL_Driver_manager()
 }
 
 SQL_Driver_manager::~SQL_Driver_manager() {
-	connection_cache.for_each(expire_connections, time(0)+(time_t)1/*=in future=expire all*/);
+	connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/);
 
 	if(is_dlinited)
 		lt_dlexit();
@@ -66,7 +114,8 @@ SQL_Driver_manager::~SQL_Driver_manager(
 
 /// @param aurl protocol://[driver-dependent]
 SQL_Connection* SQL_Driver_manager::get_connection(const String& aurl,
-						   Table *protocol2driver_and_client) {
+						   Table *protocol2driver_and_client,
+						   const char* arequest_charset) {
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
 		throw Exception("parser.runtime",
@@ -131,10 +180,12 @@ SQL_Connection* SQL_Driver_manager::get_
 
 			const char* filename=library->cstr(String::L_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
-			if (!handle)
+			if (!handle) {
+				const char* error=lt_dlerror();
 				throw Exception(0,
 					library,
-					"can not open the module, %s", lt_dlerror());
+					error?error:"can not open the module");
+			}
 
 			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
 				SQL_DRIVER_CREATE_NAME);
@@ -169,7 +220,7 @@ SQL_Connection* SQL_Driver_manager::get_
 			put_driver_to_cache(protocol, driver);
 		}
 	
-		connection=new SQL_Connection(aurl, *driver);
+		connection=new SQL_Connection(aurl, *driver, arequest_charset);
 		// associate with pool[request]  (deassociates at close)
 		connection->set_url(); 
 	}