--- parser3/src/main/pa_sql_driver_manager.C	2001/08/24 07:04:52	1.26
+++ parser3/src/main/pa_sql_driver_manager.C	2001/10/19 12:43:30	1.41
@@ -2,10 +2,10 @@
 	Parser: sql driver manager implementation.
 
 	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.41 2001/10/19 12:43:30 parser Exp $
 */
-static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.26 2001/08/24 07:04:52 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -14,17 +14,14 @@ static const char *RCSId="$Id: pa_sql_dr
 #include "pa_common.h"
 #include "pa_threads.h"
 
-#include "pa_sapi.h"
-
 // 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
@@ -38,9 +35,10 @@ public:
 	void *malloc(size_t size) { return Pooled::malloc(size); }
 	/// allocates some bytes clearing them with zeros
 	void *calloc(size_t size) { return Pooled::calloc(size); }
+
 	/// throw exception
 	void _throw(const char *comment) { 
-		THROW(0, 0, 
+		throw Exception(0, 0, 
 			&furl, 
 			comment); 
 	}
@@ -52,15 +50,16 @@ private:
 // SQL_Driver_manager
 
 /// @param request_url protocol://[driver-dependent]
-SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, 
+SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url,
+												   const String& request_origin,
 												   Table *protocol2driver_and_client) {
-	Pool& pool=request_url.pool(); // request pool											   
+	Pool& pool=request_origin.pool(); // request pool											   
 
 	// we have table for locating protocol's library
 	if(!protocol2driver_and_client)
-		PTHROW(0, 0,
+		throw Exception(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);
@@ -75,9 +74,9 @@ SQL_Connection& SQL_Driver_manager::get_
 	else { // no cached connection or it were unpingabe: connect/reconnect
 		int pos=request_url.pos("://", 3);
 		if(pos<0)
-			PTHROW(0, 0,
-				&request_url,
-				"no protocol specified"); // NOTE: not THROW, but PTHROW
+			throw Exception(0, 0,
+				request_url.size()?&request_url:&request_origin,
+				"connection string must start with protocol://"); // NOTE: not THROW, but PTHROW
 
 		// make global_url C-string on global pool
 		request_url_cstr=request_url.cstr(String::UL_AS_IS);
@@ -105,30 +104,35 @@ SQL_Connection& SQL_Driver_manager::get_
 			const String *library=0;
 			if(protocol2driver_and_client->locate(0, global_protocol)) {
 				if(!(library=protocol2driver_and_client->item(1)) || library->size()==0)
-					PTHROW(0, 0,
+					throw Exception(0, 0,
 						protocol2driver_and_client->origin_string(),
 						"driver library column for protocol '%s' is empty", 
 							request_protocol_cstr);
 				dlopen_file_spec=protocol2driver_and_client->item(2);
 			} else
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					&request_url,
 					"undefined protocol '%s'", 
 						request_protocol_cstr);
 
-			const char *filename=library->cstr(String::UL_FILE_NAME);
+			if(lt_dlinit())
+				throw Exception(0, 0,
+					library,
+					"prepare to dynamic loading failed, %s", lt_dlerror());
+
+			const char *filename=library->cstr(String::UL_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle)
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					library,
 					"can not open the module, %s", lt_dlerror());
 
 			SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, 
-				LIBRARY_CREATE_FUNC_NAME);  
+				SQL_DRIVER_CREATE_NAME);
 			if(!create)
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					library,
-					"function '%s' was not found", LIBRARY_CREATE_FUNC_NAME);
+					"function '"SQL_DRIVER_CREATE_NAME"' was not found");
 
 			// create library-driver!
 			driver=(*create)();
@@ -136,7 +140,7 @@ SQL_Connection& SQL_Driver_manager::get_
 			// validate driver api version
 			int driver_api_version=driver->api_version();
 			if(driver_api_version!=SQL_DRIVER_API_VERSION)
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					library,
 					"driver implements API version 0x%04X not equal to 0x%04X",
 						driver_api_version, SQL_DRIVER_API_VERSION);
@@ -145,10 +149,10 @@ SQL_Connection& SQL_Driver_manager::get_
 			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;
+				dlopen_file_spec->cstr(String::UL_FILE_SPEC):0;
 			if(const char *error=driver->initialize(
 				dlopen_file_spec_cstr))
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					library,
 					"driver failed to initialize client library '%s', %s",
 						specified_dlopen_file_spec?dlopen_file_spec_cstr:"unspecifed", 
@@ -229,7 +233,7 @@ static void expire_connection(Array::Ite
 	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) {