--- parser3/src/main/pa_sql_driver_manager.C	2001/11/05 10:21:28	1.49
+++ parser3/src/main/pa_sql_driver_manager.C	2001/12/13 15:13:57	1.57
@@ -2,9 +2,9 @@
 	Parser: sql driver manager implementation.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_sql_driver_manager.C,v 1.49 2001/11/05 10:21:28 paf Exp $
+	$Id: pa_sql_driver_manager.C,v 1.57 2001/12/13 15:13:57 paf Exp $
 */
 
 #include "pa_sql_driver_manager.h"
@@ -88,17 +88,15 @@ static void expire_connections(const Has
 
 // SQL_Driver_manager
 
-SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Pooled(apool),
+SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Cache_manager(apool),
 		driver_cache(apool),
 		connection_cache(apool),
 		prev_expiration_pass_time(0) {
-
-	status_providers->put(*NEW String(pool(), "sql"), this);
 }
 
 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]
@@ -155,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,
@@ -204,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
@@ -263,8 +260,6 @@ void SQL_Driver_manager::put_driver_to_c
 SQL_Connection *SQL_Driver_manager::get_connection_from_cache(const String& url) { 
 	SYNCHRONIZED;
 
-	maybe_expire_connection_cache();
-
 	if(Stack *connections=static_cast<Stack *>(connection_cache.get(url)))
 		while(connections->top_index()>=0) { // there are cached connections to that 'url'
 			SQL_Connection *result=static_cast<SQL_Connection *>(connections->pop());
@@ -287,7 +282,7 @@ void SQL_Driver_manager::put_connection_
 	connections->push(&connection);
 }
 
-void SQL_Driver_manager::maybe_expire_connection_cache() {
+void SQL_Driver_manager::maybe_expire_cache() {
 	time_t now=time(0);
 
 	if(prev_expiration_pass_time<now-CHECK_EXPIRED_CONNECTIONS_SECONDS) {
@@ -304,9 +299,11 @@ static void add_connection_to_status_cac
 
 	if(connection.connected()) {
 		Pool& pool=table.pool();
-		Array& row=*new(pool) Array(pool, 3);
+		Array& row=*new(pool) Array(pool);
 
+		// 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);
 		int time_buf_size=strlen(unsafe_time_cstr);
@@ -323,14 +320,12 @@ 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);
 	
 	// cache
 	{
-		Array& columns=*new(pool) Array(pool, 3);
+		Array& columns=*new(pool) Array(pool);
 		columns+=new(pool) String(pool, "url");
 		columns+=new(pool) String(pool, "time");
 		Table& table=*new(pool) Table(pool, 0, &columns, connection_cache.size());
@@ -341,4 +336,4 @@ Value& SQL_Driver_manager::get_status(Po
 	}
 
 	return result;
-}
\ No newline at end of file
+}