--- parser3/src/main/pa_sql_driver_manager.C 2001/11/08 14:47:32 1.52 +++ parser3/src/main/pa_sql_driver_manager.C 2001/12/13 15:13:57 1.57 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_sql_driver_manager.C,v 1.52 2001/11/08 14:47:32 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" @@ -96,7 +96,7 @@ SQL_Driver_manager::SQL_Driver_manager(P SQL_Driver_manager::~SQL_Driver_manager() { connection_cache.for_each(expire_connections, - reinterpret_cast((time_t)0/*=in past=expire all*/)); + reinterpret_cast(time(0)+1/*=in future=expire all*/)); } /// @param request_url protocol://[driver-dependent] @@ -153,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, @@ -202,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 @@ -321,8 +320,6 @@ 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); @@ -339,4 +336,4 @@ Value& SQL_Driver_manager::get_status(Po } return result; -} \ No newline at end of file +}