--- parser3/src/main/pa_sql_driver_manager.C	2004/03/04 12:05:16	1.83
+++ parser3/src/main/pa_sql_driver_manager.C	2007/04/23 10:30:32	1.87
@@ -1,11 +1,11 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2004 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: 2004/03/04 12:05:16 $";
+static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2007/04/23 10:30:32 $";
 
 #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;
@@ -103,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)10/*=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();
@@ -115,7 +118,7 @@ SQL_Connection* SQL_Driver_manager::get_
 						   const char* arequest_charset) {
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&aurl,
 			"$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined");
 
@@ -135,7 +138,7 @@ SQL_Connection* SQL_Driver_manager::get_
 	else { // no cached connection or it were unpingabe: connect/reconnect
 		url_cstr=aurl.cstrm();
 		if(!strstr(url_cstr, "://"))
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				aurl.length()?&aurl:0,
 				"connection string must start with protocol://");
 
@@ -155,13 +158,13 @@ SQL_Connection* SQL_Driver_manager::get_
 			Table::Action_options options;
 			if(protocol2driver_and_client->locate(0, protocol, options)) {
 				if(!(library=protocol2driver_and_client->item(1)) || library->length()==0)
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
 						"driver library column for protocol '%s' is empty", 
 							protocol_cstr);
 				dlopen_file_spec=protocol2driver_and_client->item(2);
 			} else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&aurl,
 					"undefined protocol '%s'", 
 						protocol_cstr);
@@ -184,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,
@@ -283,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;
 	}
@@ -320,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));
 	}