--- parser3/src/main/pa_sql_driver_manager.C	2003/12/22 11:44:35	1.80
+++ parser3/src/main/pa_sql_driver_manager.C	2006/04/09 13:38:47	1.86
@@ -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/22 11:44:35 $";
+static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2006/04/09 13:38:47 $";
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -32,8 +32,11 @@ 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;
@@ -46,9 +49,34 @@ void SQL_Driver_services_impl::transcode
 	) 
 {
 	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), 
-			charsets.get(charset_from_name),
-			charsets.get(charset_to_name));
+			*charset_from_object,
+			*charset_to_object);
 		dst=result.str;
 		dst_length=result.length;
 	} catch(const Exception& e) {
@@ -78,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<time_t>(expire_connections, time(0)+(time_t)10/*=in future=expire all*/);
 
 	if(is_dlinited)
 		lt_dlexit();
@@ -159,8 +187,8 @@ SQL_Connection* SQL_Driver_manager::get_
 					error?error:"can not open the module");
 			}
 
-			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
-				SQL_DRIVER_CREATE_NAME);
+			SQL_Driver_create_func create=(SQL_Driver_create_func)(lt_dlsym(handle, 
+				SQL_DRIVER_CREATE_NAME));
 			if(!create)
 				throw Exception(0,
 					library,
@@ -258,7 +286,7 @@ void SQL_Driver_manager::maybe_expire_ca
 	time_t now=time(0);
 
 	if(prev_expiration_pass_time<now-CHECK_EXPIRED_CONNECTIONS_SECONDS) {
-		connection_cache.for_each(expire_connections, time_t(now-EXPIRE_UNUSED_CONNECTION_SECONDS));
+		connection_cache.for_each<time_t>(expire_connections, time_t(now-EXPIRE_UNUSED_CONNECTION_SECONDS));
 
 		prev_expiration_pass_time=now;
 	}
@@ -295,7 +323,7 @@ Value* SQL_Driver_manager::get_status()
 		columns+=new String("time");
 		Table& table=*new Table(&columns, connection_cache.count());
 
-		connection_cache.for_each(add_connections_to_status_cache_table, &table);
+		connection_cache.for_each<Table*>(add_connections_to_status_cache_table, &table);
 
 		result->get_hash()->put(*new String("cache"), new VTable(&table));
 	}