--- parser3/src/main/pa_sql_driver_manager.C	2001/09/05 09:22:45	1.32
+++ parser3/src/main/pa_sql_driver_manager.C	2001/09/14 15:49:06	1.35
@@ -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.32 2001/09/05 09:22:45 parser Exp $"; 
+static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.35 2001/09/14 15:49:06 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -14,12 +14,6 @@ static const char *RCSId="$Id: pa_sql_dr
 #include "pa_common.h"
 #include "pa_threads.h"
 
-#include "pa_sapi.h"
-
-// helper macros
-
-#define STRINGIZE(name) #name
-
 // globals
 
 SQL_Driver_manager *SQL_driver_manager;
@@ -124,7 +118,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,
@@ -132,11 +126,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, 
-				STRINGIZE(SQL_DRIVER_CREATE));
+				SQL_DRIVER_CREATE_NAME);
 			if(!create)
 				PTHROW(0, 0,
 					library,
-					"function '%s' was not found", STRINGIZE(SQL_DRIVER_CREATE));
+					"function '"SQL_DRIVER_CREATE_NAME"' was not found");
 
 			// create library-driver!
 			driver=(*create)();
@@ -153,7 +147,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,