--- parser3/src/main/pa_sql_driver_manager.C	2001/09/05 08:57:43	1.30
+++ parser3/src/main/pa_sql_driver_manager.C	2001/09/14 15:41:59	1.34
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.30 2001/09/05 08:57:43 parser Exp $"; 
+static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.34 2001/09/14 15:41:59 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -14,7 +14,7 @@ static const char *RCSId="$Id: pa_sql_dr
 #include "pa_common.h"
 #include "pa_threads.h"
 
-#include "pa_sapi.h"
+//#include "pa_sapi.h"
 
 // globals
 
@@ -59,7 +59,7 @@ SQL_Connection& SQL_Driver_manager::get_
 	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);
@@ -120,7 +120,7 @@ SQL_Connection& SQL_Driver_manager::get_
 					library,
 					"prepare to dynamic loading failed, %s", lt_dlerror());
 
-			const char *filename=library->cstr(String::UL_FILE_NAME);
+			const char *filename=library->cstr(String::UL_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle)
 				PTHROW(0, 0,
@@ -128,11 +128,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, 
-				SQL_DRIVER_CREATE_FUNC_NAME);  
+				SQL_DRIVER_CREATE_NAME);
 			if(!create)
 				PTHROW(0, 0,
 					library,
-					"function '%s' was not found", SQL_DRIVER_CREATE_FUNC_NAME);
+					"function '"SQL_DRIVER_CREATE_NAME"' was not found");
 
 			// create library-driver!
 			driver=(*create)();
@@ -149,7 +149,7 @@ 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,