--- parser3/src/main/pa_sql_driver_manager.C	2001/05/17 18:26:22	1.17
+++ parser3/src/main/pa_sql_driver_manager.C	2001/09/05 09:22:45	1.32
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sql_driver_manager.C,v 1.17 2001/05/17 18:26:22 parser Exp $
 */
+static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.32 2001/09/05 09:22:45 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -17,15 +16,18 @@
 
 #include "pa_sapi.h"
 
+// helper macros
+
+#define STRINGIZE(name) #name
+
 // globals
 
 SQL_Driver_manager *SQL_driver_manager;
 
 // consts
 
-const char *LIBRARY_CREATE_FUNC_NAME="create";
 const int EXPIRE_UNUSED_CONNECTION_SECONDS=60;
-const int CHECK_EXPIRED_CONNECTIONS_SECONDS=60*2;
+const int CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2;
 
 
 /// SQL_Driver_services Pooled implementation
@@ -55,14 +57,13 @@ private:
 /// @param request_url protocol://[driver-dependent]
 SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, 
 												   Table *protocol2driver_and_client) {
-////__asm int 3;
 	Pool& pool=request_url.pool(); // request pool											   
 
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
 		PTHROW(0, 0,
 			&request_url,
-			"$SQL:drivers table must be defined");
+			"$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined");
 
 	// first trying to get cached connection
 	SQL_Connection *result=get_connection_from_cache(request_url);
@@ -111,17 +112,18 @@ SQL_Connection& SQL_Driver_manager::get_
 						protocol2driver_and_client->origin_string(),
 						"driver library column for protocol '%s' is empty", 
 							request_protocol_cstr);
-				if(!(dlopen_file_spec=protocol2driver_and_client->item(2)) || dlopen_file_spec->size()==0)
-					PTHROW(0, 0,
-						protocol2driver_and_client->origin_string(),
-						"client library column for protocol '%s' is empty", 
-							request_protocol_cstr);
+				dlopen_file_spec=protocol2driver_and_client->item(2);
 			} else
 				PTHROW(0, 0,
 					&request_url,
 					"undefined protocol '%s'", 
 						request_protocol_cstr);
 
+			if(lt_dlinit())
+				PTHROW(0, 0,
+					library,
+					"prepare to dynamic loading failed, %s", lt_dlerror());
+
 			const char *filename=library->cstr(String::UL_FILE_NAME);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle)
@@ -130,11 +132,11 @@ SQL_Connection& SQL_Driver_manager::get_
 					"can not open the module, %s", lt_dlerror());
 
 			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
-				LIBRARY_CREATE_FUNC_NAME);  
+				STRINGIZE(SQL_DRIVER_CREATE));
 			if(!create)
 				PTHROW(0, 0,
 					library,
-					"function '%s' was not found", LIBRARY_CREATE_FUNC_NAME);
+					"function '%s' was not found", STRINGIZE(SQL_DRIVER_CREATE));
 
 			// create library-driver!
 			driver=(*create)();
@@ -148,13 +150,17 @@ SQL_Connection& SQL_Driver_manager::get_
 						driver_api_version, SQL_DRIVER_API_VERSION);
 
 			// initialise by connecting to sql client dynamic link library
-			const char *dlopen_file_spec_cstr=dlopen_file_spec->cstr(String::UL_FILE_NAME);
+			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_NAME):0;
 			if(const char *error=driver->initialize(
 				dlopen_file_spec_cstr))
 				PTHROW(0, 0,
 					library,
 					"driver failed to initialize client library '%s', %s",
-						dlopen_file_spec_cstr, error);
+						specified_dlopen_file_spec?dlopen_file_spec_cstr:"unspecifed", 
+						error);
 
 			// cache it
 			put_driver_to_cache(global_protocol, *driver);
@@ -199,10 +205,12 @@ void SQL_Driver_manager::put_driver_to_c
 }
 
 // connection cache
-
+/// @todo get rid of memory spending Stack [zeros deep inside got accumulated]
 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());
@@ -217,8 +225,6 @@ void SQL_Driver_manager::put_connection_
 												 SQL_Connection& connection) { 
 	SYNCHRONIZED;
 
-	maybe_expire_connection_cache();
-
 	Stack *connections=static_cast<Stack *>(connection_cache.get(url));
 	if(!connections) { // there are no cached connections to that 'url' yet?
 		connections=NEW Stack(pool()); // NOTE: never freed up!
@@ -230,11 +236,14 @@ void SQL_Driver_manager::put_connection_
 static void expire_connection(Array::Item *value, void *info) {
 	SQL_Connection& connection=*static_cast<SQL_Connection *>(value);
 	time_t older_dies=reinterpret_cast<time_t>(info);
-	if(connection.expired(older_dies))
+
+	if(connection.connected() && connection.expired(older_dies))
 		connection.disconnect();
 }
 static void expire_connections(const Hash::Key& key, Hash::Val *value, void *info) {
-	static_cast<Stack *>(value)->for_each(expire_connection, info);
+	Stack& stack=*static_cast<Stack *>(value);
+	for(int i=0; i<=stack.top_index(); i++)
+		expire_connection(stack.get(i), info);
 }
 void SQL_Driver_manager::maybe_expire_connection_cache() {
 	time_t now=time(0);
@@ -245,4 +254,4 @@ void SQL_Driver_manager::maybe_expire_co
 
 		prev_expiration_pass_time=now;
 	}
-}
\ No newline at end of file
+}