--- parser3/src/main/pa_sql_driver_manager.C	2001/11/08 14:47:32	1.52
+++ parser3/src/main/pa_sql_driver_manager.C	2002/02/08 08:30:16	1.61
@@ -1,10 +1,10 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_sql_driver_manager.C,v 1.52 2001/11/08 14:47:32 paf Exp $
+	$Id: pa_sql_driver_manager.C,v 1.61 2002/02/08 08:30:16 paf Exp $
 */
 
 #include "pa_sql_driver_manager.h"
@@ -96,11 +96,11 @@ SQL_Driver_manager::SQL_Driver_manager(P
 
 SQL_Driver_manager::~SQL_Driver_manager() {
 	connection_cache.for_each(expire_connections, 
-		reinterpret_cast<void *>((time_t)0/*=in past=expire all*/));
+		reinterpret_cast<void *>(time(0)+1/*=in future=expire all*/));
 }
 
 /// @param request_url protocol://[driver-dependent]
-SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url,
+SQL_Connection_ptr SQL_Driver_manager::get_connection(const String& request_url,
 												   const String& request_origin,
 												   Table *protocol2driver_and_client) {
 	Pool& pool=request_origin.pool(); // request pool											   
@@ -115,17 +115,17 @@ SQL_Connection& SQL_Driver_manager::get_
 	SQL_Driver_services *services=new(pool) SQL_Driver_services_impl(pool, request_url); 
 
 	// first trying to get cached connection
-	SQL_Connection *result=get_connection_from_cache(request_url);
-	if(result) {
-		result->set_services(services);
-		if(!result->ping()) { // we have some cached connection, is it pingable?
-			result->disconnect(); // kill unpingabe=dead connection
-			result=0;
+	SQL_Connection *connection=get_connection_from_cache(request_url);
+	if(connection) {
+		connection->set_services(services);
+		if(!connection->ping()) { // we have some cached connection, is it pingable?
+			connection->disconnect(); // kill unpingabe=dead connection
+			connection=0;
 		}
 	}
 
 	char *request_url_cstr;
-	if(result)
+	if(connection)
 		request_url_cstr=0; // calm, compiler
 	else { // no cached connection or it were unpingabe: connect/reconnect
 		int pos=request_url.pos("://", 3);
@@ -153,11 +153,11 @@ SQL_Connection& SQL_Driver_manager::get_
 			global_protocol_cstr);
 
 		SQL_Driver *driver;
-		const String *dlopen_file_spec=0;
 		// first trying to get cached driver
 		if(!(driver=get_driver_from_cache(global_protocol))) {
 			// no cached
 			const String *library=0;
+			const String *dlopen_file_spec=0;
 			if(protocol2driver_and_client->locate(0, global_protocol)) {
 				if(!(library=protocol2driver_and_client->item(1)) || library->size()==0)
 					throw Exception(0, 0,
@@ -202,16 +202,15 @@ SQL_Connection& SQL_Driver_manager::get_
 						driver_api_version, SQL_DRIVER_API_VERSION);
 
 			// initialise by connecting to sql client dynamic link library
-			bool specified_dlopen_file_spec=dlopen_file_spec && dlopen_file_spec->size();
-			const char *dlopen_file_spec_cstr=
-				specified_dlopen_file_spec?
-				dlopen_file_spec->cstr(String::UL_FILE_SPEC):0;
+			char *dlopen_file_spec_cstr=
+				dlopen_file_spec && dlopen_file_spec->size()?
+				dlopen_file_spec->cstr(String::UL_AS_IS):0;
 			if(const char *error=driver->initialize(
 				dlopen_file_spec_cstr))
 				throw Exception(0, 0,
 					library,
 					"driver failed to initialize client library '%s', %s",
-						specified_dlopen_file_spec?dlopen_file_spec_cstr:"unspecifed", 
+						dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed", 
 						error);
 
 			// cache it
@@ -221,16 +220,16 @@ SQL_Connection& SQL_Driver_manager::get_
 		// allocate in global pool 
 		// associate with services[request]
 		// NOTE: never freed up!
-		result=new(this->pool()) SQL_Connection(this->pool(), global_url, *driver);
+		connection=new(this->pool()) SQL_Connection(this->pool(), global_url, *driver);
 		// associate with services[request]  (deassociates at close)
-		result->set_services(services); 
+		connection->set_services(services); 
 	}
 
-	// if not connected yet, do that now, when result has services
-	if(!result->connected())
-		result->connect(request_url_cstr);
-	// return it
-	return *result;
+	// if not connected yet, do that now, when connection has services
+	if(!connection->connected())
+		connection->connect(request_url_cstr);
+	// return autoclosing object for it
+	return SQL_Connection_ptr(connection);
 }
 
 void SQL_Driver_manager::close_connection(const String& url, 
@@ -305,8 +304,8 @@ static void add_connection_to_status_cac
 		// url
 		row+=&url_without_login(pool, connection.get_url());
 		// time
-		time_t time_stamp=connection.get_time_stamp();
-		const char *unsafe_time_cstr=ctime(&time_stamp);
+		time_t time_used=connection.get_time_used();
+		const char *unsafe_time_cstr=ctime(&time_used);
 		int time_buf_size=strlen(unsafe_time_cstr);
 		char *safe_time_buf=(char *)pool.malloc(time_buf_size);
 		memcpy(safe_time_buf, unsafe_time_cstr, time_buf_size);
@@ -321,8 +320,6 @@ static void add_connections_to_status_ca
 	for(int countdown=stack.top_index(); countdown-->=0; )
 		add_connection_to_status_cache_table(iter.next(), info);
 }
-
-
 Value& SQL_Driver_manager::get_status(Pool& pool, const String *source) {
 	VHash& result=*new(pool) VHash(pool);
 	
@@ -339,4 +336,4 @@ Value& SQL_Driver_manager::get_status(Po
 	}
 
 	return result;
-}
\ No newline at end of file
+}